From 9d16962f5bae2e9b47064b9a2376974d55239648 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@lineageos.org>
Date: Sun, 4 Feb 2018 04:33:18 +0200
Subject: Automatic translation import

Change-Id: Idc6a452a007067e3041bd7e4f19e87573763fd32
---
 quickReader/res/values-de/strings.xml     |   2 +-
 quickReader/res/values-el/strings.xml     |  13 +
 quickReader/res/values-en-rCA/strings.xml |  31 ++
 quickReader/res/values-fr/strings.xml     |  12 +
 quickReader/res/values-ja/strings.xml     |  13 +
 quickReader/res/values-tl/strings.xml     |  31 ++
 res/values-af/qcomstrings.xml             |  10 +-
 res/values-am/qcomstrings.xml             |   5 -
 res/values-ar/qcomstrings.xml             |  10 +-
 res/values-as-rIN/qcomstrings.xml         |  10 +-
 res/values-ast-rES/qcomstrings.xml        |   8 +-
 res/values-az-rAZ/qcomstrings.xml         |   5 -
 res/values-be-rBY/qcomstrings.xml         |  10 +-
 res/values-bg/qcomstrings.xml             |  11 +-
 res/values-bn-rBD/qcomstrings.xml         |   5 -
 res/values-br-rFR/qcomstrings.xml         |   5 -
 res/values-bs-rBA/qcomstrings.xml         |   5 -
 res/values-ca/qcomstrings.xml             |  11 +-
 res/values-cs/qcomstrings.xml             |  10 +-
 res/values-csb-rPL/qcomstrings.xml        |   5 -
 res/values-cy/cm_strings.xml              |   2 +
 res/values-cy/qcomstrings.xml             |   7 +-
 res/values-cy/strings.xml                 |  19 +
 res/values-da/qcomstrings.xml             |  10 +-
 res/values-de/qcomstrings.xml             |  10 +-
 res/values-el/qcomstrings.xml             | 116 ++++++-
 res/values-en-rAU/qcomstrings.xml         |  10 +-
 res/values-en-rCA/cm_strings.xml          |  34 ++
 res/values-en-rCA/qcomstrings.xml         | 172 ++++++++++
 res/values-en-rCA/strings.xml             | 286 +++++++++++++++
 res/values-en-rGB/qcomstrings.xml         |  10 +-
 res/values-en-rIN/qcomstrings.xml         |  10 +-
 res/values-en-rPT/qcomstrings.xml         |   5 -
 res/values-eo/qcomstrings.xml             |   5 -
 res/values-es-rCO/qcomstrings.xml         |   5 -
 res/values-es-rMX/qcomstrings.xml         |  10 +-
 res/values-es-rUS/qcomstrings.xml         |  10 +-
 res/values-es/qcomstrings.xml             |  10 +-
 res/values-et-rEE/qcomstrings.xml         |   5 -
 res/values-eu-rES/qcomstrings.xml         |  10 +-
 res/values-fa/qcomstrings.xml             |   5 -
 res/values-fi/qcomstrings.xml             |  10 +-
 res/values-fil-rPH/qcomstrings.xml        |   5 -
 res/values-fr-rCA/qcomstrings.xml         |   5 -
 res/values-fr/qcomstrings.xml             |  10 +-
 res/values-frp-rIT/qcomstrings.xml        |   5 -
 res/values-fy-rNL/qcomstrings.xml         |   5 -
 res/values-ga-rIE/qcomstrings.xml         |   5 -
 res/values-gd-rGB/qcomstrings.xml         |   5 -
 res/values-gl-rES/qcomstrings.xml         |  11 +-
 res/values-gu-rIN/qcomstrings.xml         |  10 +-
 res/values-hi/qcomstrings.xml             |   5 -
 res/values-hr/qcomstrings.xml             |  10 +-
 res/values-hu/qcomstrings.xml             |  10 +-
 res/values-hy-rAM/qcomstrings.xml         |   5 -
 res/values-in/qcomstrings.xml             |  10 +-
 res/values-is-rIS/qcomstrings.xml         |   5 -
 res/values-it/qcomstrings.xml             |  11 +-
 res/values-iw/qcomstrings.xml             |  10 +-
 res/values-ja/qcomstrings.xml             |  10 +-
 res/values-ka-rGE/qcomstrings.xml         |   5 -
 res/values-kab-rDZ/qcomstrings.xml        |   5 -
 res/values-kk-rKZ/qcomstrings.xml         |   5 -
 res/values-km-rKH/qcomstrings.xml         |   5 -
 res/values-kn-rIN/qcomstrings.xml         |  10 +-
 res/values-ko/qcomstrings.xml             |  10 +-
 res/values-ku/qcomstrings.xml             |   5 -
 res/values-ky-rKG/qcomstrings.xml         |   5 -
 res/values-lb/qcomstrings.xml             |  10 +-
 res/values-lo-rLA/qcomstrings.xml         |   5 -
 res/values-lt/qcomstrings.xml             |   5 -
 res/values-lv/qcomstrings.xml             |   5 -
 res/values-mk-rMK/qcomstrings.xml         |   5 -
 res/values-ml-rIN/qcomstrings.xml         |  10 +-
 res/values-mn-rMN/qcomstrings.xml         |   5 -
 res/values-mr-rIN/qcomstrings.xml         |  10 +-
 res/values-ms-rMY/qcomstrings.xml         |   5 -
 res/values-my-rMM/qcomstrings.xml         |   5 -
 res/values-nb/qcomstrings.xml             |  10 +-
 res/values-ne-rNP/qcomstrings.xml         |   5 -
 res/values-nl/qcomstrings.xml             |  10 +-
 res/values-oc-rFR/qcomstrings.xml         |   5 -
 res/values-or-rIN/qcomstrings.xml         |  10 +-
 res/values-pa-rIN/qcomstrings.xml         |   5 -
 res/values-pl/qcomstrings.xml             |  10 +-
 res/values-pt-rBR/qcomstrings.xml         |  10 +-
 res/values-pt-rPT/qcomstrings.xml         |  10 +-
 res/values-rm/qcomstrings.xml             |   5 -
 res/values-ro/qcomstrings.xml             |  11 +-
 res/values-ru/qcomstrings.xml             |  10 +-
 res/values-sc-rIT/qcomstrings.xml         |   5 -
 res/values-si-rLK/qcomstrings.xml         |   5 -
 res/values-sk/qcomstrings.xml             |  11 +-
 res/values-sl/qcomstrings.xml             |  10 +-
 res/values-sq-rAL/qcomstrings.xml         |   9 +-
 res/values-sr-rCS/qcomstrings.xml         |   5 -
 res/values-sr/qcomstrings.xml             |  10 +-
 res/values-sv/qcomstrings.xml             |  10 +-
 res/values-sw/qcomstrings.xml             |   5 -
 res/values-ta-rIN/qcomstrings.xml         |  10 +-
 res/values-te-rIN/qcomstrings.xml         |  10 +-
 res/values-th/qcomstrings.xml             |  10 +-
 res/values-tl/cm_strings.xml              |  34 ++
 res/values-tl/qcomstrings.xml             | 172 ++++++++++
 res/values-tl/strings.xml                 | 553 +++++++++++++++---------------
 res/values-tr/qcomstrings.xml             |  10 +-
 res/values-ug/qcomstrings.xml             |  10 +-
 res/values-uk/qcomstrings.xml             |  10 +-
 res/values-ur-rPK/qcomstrings.xml         |   5 -
 res/values-uz-rUZ/qcomstrings.xml         |   5 -
 res/values-vec-rIT/qcomstrings.xml        |   5 -
 res/values-vi/qcomstrings.xml             |  10 +-
 res/values-zh-rCN/qcomstrings.xml         |  10 +-
 res/values-zh-rHK/qcomstrings.xml         |   5 -
 res/values-zh-rTW/qcomstrings.xml         |  11 +-
 res/values-zu/qcomstrings.xml             |   5 -
 116 files changed, 1420 insertions(+), 851 deletions(-)
 create mode 100644 quickReader/res/values-en-rCA/strings.xml
 create mode 100644 quickReader/res/values-tl/strings.xml
 create mode 100644 res/values-en-rCA/cm_strings.xml
 create mode 100644 res/values-en-rCA/qcomstrings.xml
 create mode 100644 res/values-en-rCA/strings.xml
 create mode 100644 res/values-tl/cm_strings.xml
 create mode 100644 res/values-tl/qcomstrings.xml

diff --git a/quickReader/res/values-de/strings.xml b/quickReader/res/values-de/strings.xml
index d101c09aa..b0116ad15 100644
--- a/quickReader/res/values-de/strings.xml
+++ b/quickReader/res/values-de/strings.xml
@@ -24,7 +24,7 @@
   <!-- QuickReader: permission error dialog title -->
   <string name="quick_reader_permission_error_title">Berechtigungsfehler</string>
   <!-- QuickReader: permission error dialog message when permission can be asked again -->
-  <string name="quick_reader_permission_rationale_message">Kamera-Zugriff wird zum scannen des Barcodes benötigt</string>
+  <string name="quick_reader_permission_rationale_message">Kamera-Zugriff wird zum Scannen des Barcodes benötigt</string>
   <!-- QuickReader: permission error dialog positive action when permission can be asked again -->
   <string name="quick_reader_permission_rationale_positive">Erneut nachfragen</string>
   <!-- QuickReader: permission error dialog message when permission can't be asked again -->
diff --git a/quickReader/res/values-el/strings.xml b/quickReader/res/values-el/strings.xml
index 0039d5696..19a832c44 100644
--- a/quickReader/res/values-el/strings.xml
+++ b/quickReader/res/values-el/strings.xml
@@ -16,16 +16,29 @@
 -->
 <resources>
   <!-- QuickReader: switcher item for qr -->
+  <string name="accessibility_switch_to_qr">Ανάγνωση QR</string>
   <!-- QuickReader: dismiss button for dialogs -->
+  <string name="quick_reader_action_dismiss">Απόρριψη</string>
   <!-- QuickReader: toast shown when there's no app installed to open the qr code content -->
+  <string name="quick_reader_no_activity_found">Δεν υπάρχει εγκατεστημένη εφαρμογή που να μπορεί να ανοίξει αυτό το περιεχόμενο</string>
   <!-- QuickReader: permission error dialog title -->
+  <string name="quick_reader_permission_error_title">Σφάλμα δικαιωμάτων</string>
   <!-- QuickReader: permission error dialog message when permission can be asked again -->
+  <string name="quick_reader_permission_rationale_message">Η πρόσβαση στην κάμερα είναι απαραίτητη για να σαρώσετε το barcode</string>
   <!-- QuickReader: permission error dialog positive action when permission can be asked again -->
+  <string name="quick_reader_permission_rationale_positive">Ερώτηση ξανά</string>
   <!-- QuickReader: permission error dialog message when permission can't be asked again -->
+  <string name="quick_reader_permission_fatal_message">Δεν επιτράπηκε η πρόσβαση στην κάμερα. Παρακαλώ επιτρέψτε το από τις ρυθμίσεις της εφαρμογής</string>
   <!-- QuickReader: permission error dialog positive action when permission can't be asked again -->
+  <string name="quick_reader_permission_fatal_positive">Άνοιγμα ρυθμίσεων</string>
   <!-- QuickReader: scanned text dialog title -->
+  <string name="quick_reader_scanned_text_title">Σαρωμένο κείμενο</string>
   <!-- QuickReader: scanned text dialog positive button (copy to clipboard) -->
+  <string name="quick_reader_scanned_text_positive">Αντιγραφή</string>
   <!-- QuickReader: scanned text dialog negative button (share) -->
+  <string name="quick_reader_scanned_text_negative">Κοινή χρήση</string>
   <!-- QuickReader: scanned text shared activity selector title -->
+  <string name="quick_reader_share_title">Κοινή χρήση μέσω\u2026</string>
   <!-- QuickReader: toast shown when the scanned text has been copied to the clipboard -->
+  <string name="quick_reader_copied_message">Αντιγράφηκε στο πρόχειρο</string>
 </resources>
diff --git a/quickReader/res/values-en-rCA/strings.xml b/quickReader/res/values-en-rCA/strings.xml
new file mode 100644
index 000000000..0039d5696
--- /dev/null
+++ b/quickReader/res/values-en-rCA/strings.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- 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.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+  <!-- QuickReader: switcher item for qr -->
+  <!-- QuickReader: dismiss button for dialogs -->
+  <!-- QuickReader: toast shown when there's no app installed to open the qr code content -->
+  <!-- QuickReader: permission error dialog title -->
+  <!-- QuickReader: permission error dialog message when permission can be asked again -->
+  <!-- QuickReader: permission error dialog positive action when permission can be asked again -->
+  <!-- QuickReader: permission error dialog message when permission can't be asked again -->
+  <!-- QuickReader: permission error dialog positive action when permission can't be asked again -->
+  <!-- QuickReader: scanned text dialog title -->
+  <!-- QuickReader: scanned text dialog positive button (copy to clipboard) -->
+  <!-- QuickReader: scanned text dialog negative button (share) -->
+  <!-- QuickReader: scanned text shared activity selector title -->
+  <!-- QuickReader: toast shown when the scanned text has been copied to the clipboard -->
+</resources>
diff --git a/quickReader/res/values-fr/strings.xml b/quickReader/res/values-fr/strings.xml
index 0039d5696..e92515e1d 100644
--- a/quickReader/res/values-fr/strings.xml
+++ b/quickReader/res/values-fr/strings.xml
@@ -16,16 +16,28 @@
 -->
 <resources>
   <!-- QuickReader: switcher item for qr -->
+  <string name="accessibility_switch_to_qr">Lecteur de QR code</string>
   <!-- QuickReader: dismiss button for dialogs -->
+  <string name="quick_reader_action_dismiss">Ignorer</string>
   <!-- QuickReader: toast shown when there's no app installed to open the qr code content -->
+  <string name="quick_reader_no_activity_found">Aucune application installée ne peut ouvrir ce contenu</string>
   <!-- QuickReader: permission error dialog title -->
+  <string name="quick_reader_permission_error_title">Erreur d\'autorisation</string>
   <!-- QuickReader: permission error dialog message when permission can be asked again -->
+  <string name="quick_reader_permission_rationale_message">L\'accès à l\'appareil photo est nécessaire pour scanner le code-barre</string>
   <!-- QuickReader: permission error dialog positive action when permission can be asked again -->
+  <string name="quick_reader_permission_rationale_positive">Demander à nouveau</string>
   <!-- QuickReader: permission error dialog message when permission can't be asked again -->
+  <string name="quick_reader_permission_fatal_message">L\'accès à l\'appareil photo a été refusé. Autorisez-le depuis les paramètres de l\'application</string>
   <!-- QuickReader: permission error dialog positive action when permission can't be asked again -->
+  <string name="quick_reader_permission_fatal_positive">Ouvrir les paramètres</string>
   <!-- QuickReader: scanned text dialog title -->
   <!-- QuickReader: scanned text dialog positive button (copy to clipboard) -->
+  <string name="quick_reader_scanned_text_positive">Copier</string>
   <!-- QuickReader: scanned text dialog negative button (share) -->
+  <string name="quick_reader_scanned_text_negative">Partager</string>
   <!-- QuickReader: scanned text shared activity selector title -->
+  <string name="quick_reader_share_title">Partager avec\u2026</string>
   <!-- QuickReader: toast shown when the scanned text has been copied to the clipboard -->
+  <string name="quick_reader_copied_message">Copié dans le presse-papier</string>
 </resources>
diff --git a/quickReader/res/values-ja/strings.xml b/quickReader/res/values-ja/strings.xml
index 0039d5696..ef8f33ca2 100644
--- a/quickReader/res/values-ja/strings.xml
+++ b/quickReader/res/values-ja/strings.xml
@@ -16,16 +16,29 @@
 -->
 <resources>
   <!-- QuickReader: switcher item for qr -->
+  <string name="accessibility_switch_to_qr">QRコードリーダー</string>
   <!-- QuickReader: dismiss button for dialogs -->
+  <string name="quick_reader_action_dismiss">閉じる</string>
   <!-- QuickReader: toast shown when there's no app installed to open the qr code content -->
+  <string name="quick_reader_no_activity_found">このコンテンツを開くことができるアプリがインストールされていません。</string>
   <!-- QuickReader: permission error dialog title -->
+  <string name="quick_reader_permission_error_title">権限エラー</string>
   <!-- QuickReader: permission error dialog message when permission can be asked again -->
+  <string name="quick_reader_permission_rationale_message">バーコードをスキャンするためにカメラへのアクセスが必要です。</string>
   <!-- QuickReader: permission error dialog positive action when permission can be asked again -->
+  <string name="quick_reader_permission_rationale_positive">次回も確認する</string>
   <!-- QuickReader: permission error dialog message when permission can't be asked again -->
+  <string name="quick_reader_permission_fatal_message">カメラへのアクセスが拒否されました。アプリの設定から許可してください。</string>
   <!-- QuickReader: permission error dialog positive action when permission can't be asked again -->
+  <string name="quick_reader_permission_fatal_positive">設定を開く</string>
   <!-- QuickReader: scanned text dialog title -->
+  <string name="quick_reader_scanned_text_title">スキャンされたテキスト</string>
   <!-- QuickReader: scanned text dialog positive button (copy to clipboard) -->
+  <string name="quick_reader_scanned_text_positive">コピー</string>
   <!-- QuickReader: scanned text dialog negative button (share) -->
+  <string name="quick_reader_scanned_text_negative">共有</string>
   <!-- QuickReader: scanned text shared activity selector title -->
+  <string name="quick_reader_share_title">共有</string>
   <!-- QuickReader: toast shown when the scanned text has been copied to the clipboard -->
+  <string name="quick_reader_copied_message">クリップボードにコピーしました</string>
 </resources>
diff --git a/quickReader/res/values-tl/strings.xml b/quickReader/res/values-tl/strings.xml
new file mode 100644
index 000000000..0039d5696
--- /dev/null
+++ b/quickReader/res/values-tl/strings.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- 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.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+  <!-- QuickReader: switcher item for qr -->
+  <!-- QuickReader: dismiss button for dialogs -->
+  <!-- QuickReader: toast shown when there's no app installed to open the qr code content -->
+  <!-- QuickReader: permission error dialog title -->
+  <!-- QuickReader: permission error dialog message when permission can be asked again -->
+  <!-- QuickReader: permission error dialog positive action when permission can be asked again -->
+  <!-- QuickReader: permission error dialog message when permission can't be asked again -->
+  <!-- QuickReader: permission error dialog positive action when permission can't be asked again -->
+  <!-- QuickReader: scanned text dialog title -->
+  <!-- QuickReader: scanned text dialog positive button (copy to clipboard) -->
+  <!-- QuickReader: scanned text dialog negative button (share) -->
+  <!-- QuickReader: scanned text shared activity selector title -->
+  <!-- QuickReader: toast shown when the scanned text has been copied to the clipboard -->
+</resources>
diff --git a/res/values-af/qcomstrings.xml b/res/values-af/qcomstrings.xml
index 46ca49050..d2f42e9d4 100644
--- a/res/values-af/qcomstrings.xml
+++ b/res/values-af/qcomstrings.xml
@@ -160,7 +160,6 @@
   <string name="pref_camera_shuttersound_title" translatable="true">Sluitergeluid</string>
   <string name="pref_camera_shuttersound_entry_enable">Geaktiveer</string>
   <string name="pref_camera_shuttersound_entry_disable">Gedeaktiveer</string>
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">Hoë spoed/stadige aksie word nie ondersteun vir Stabilisering/Tydsduur/HDR.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -364,11 +363,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">HDR sensor</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">Multi-raam HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR soek ten minste 1x raam</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Video rotasie</string>
@@ -427,6 +421,7 @@
   <string name="pref_camera2_camera2_entry_enable">Aktiveer</string>
   <string name="pref_camera2_camera2_entry_disable">Deaktiveer</string>
   <string name="pref_camera2_mono_only_title">Slegs Mono</string>
+  <string name="pref_camera2_mono_only_entry_off">Af</string>
   <string name="pref_camera2_mono_preview_title">Mono-voorskou</string>
   <string name="pref_camera2_mono_preview_entry_on">Aan</string>
   <string name="pref_camera2_mono_preview_entry_off">Af</string>
@@ -438,6 +433,7 @@
   <string name="pref_camera2_mpo_entry_on">Aan</string>
   <string name="pref_camera2_mpo_entry_off">Af</string>
   <string name="pref_camera2_makeup_title">Make-up</string>
+  <string name="pref_camera2_makeup_entry_off">Af</string>
   <string name="pref_camera2_noise_reduction_title">Geraas vermindering</string>
   <string name="pref_camera2_noise_reduction_entry_off">Af</string>
   <string name="pref_camera2_noise_reduction_entry_fast">Vinnig</string>
@@ -446,10 +442,12 @@
   <string name="pref_camera2_videosnap_entry_enable">Aktiveer</string>
   <string name="pref_camera2_videosnap_entry_disable">Deaktiveer</string>
   <string name="pref_camera2_trackingfocus_title">Fokus volg objek</string>
+  <string name="pref_camera2_trackingfocus_entry_off">Af</string>
   <string name="pref_camera_scenemode_entry_bestpicture">Beste prent</string>
   <string name="bestpicture_done">GEDOEN</string>
   <string name="bestpicture_at_least_one_picture">Ten minste een prent moet gekies word.</string>
   <string name="pref_camera2_shutter_sound_entry_on">Aan</string>
   <string name="pref_camera2_shutter_sound_entry_off">Af</string>
   <string name="pref_camera2_shutter_sound_title">Sluiter geluid</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Mono</string>
 </resources>
diff --git a/res/values-am/qcomstrings.xml b/res/values-am/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-am/qcomstrings.xml
+++ b/res/values-am/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-ar/qcomstrings.xml b/res/values-ar/qcomstrings.xml
index e4bda318b..98c09a313 100644
--- a/res/values-ar/qcomstrings.xml
+++ b/res/values-ar/qcomstrings.xml
@@ -131,7 +131,6 @@
   <!-- Settings screen, Select Redeye Reduction -->
   <string name="pref_camera_redeyereduction_title">تقليل العين الحمراء</string>
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">تسجيل معدل الإطارات العليا غير معتمد عند استخدام التثبيت/الوقت الفاصل/HDR.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -310,11 +309,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">HDR للمستشعر</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">HDR للإطارات المتعددة</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR يحتاج 1x إطار</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">تدوير الفيديو</string>
@@ -336,9 +330,13 @@
   <string name="all_in_focus">كل شيء في التركيز</string>
   <string name="refocus_toast">لإعادة تركيز الصورة الأخيرة، اضغط هنا</string>
   <!-- Help menu strings -->
+  <string name="pref_camera2_mono_only_entry_off">إيقاف تشغيل</string>
   <string name="pref_camera2_mono_preview_entry_off">إيقاف تشغيل</string>
   <string name="pref_camera2_clearsight_entry_off">إيقاف تشغيل</string>
   <string name="pref_camera2_mpo_entry_off">إيقاف تشغيل</string>
+  <string name="pref_camera2_makeup_entry_off">إيقاف تشغيل</string>
   <string name="pref_camera2_noise_reduction_entry_off">إيقاف تشغيل</string>
+  <string name="pref_camera2_trackingfocus_entry_off">إيقاف تشغيل</string>
   <string name="pref_camera2_shutter_sound_entry_off">إيقاف تشغيل</string>
+  <string name="pref_camera2_initial_camera_entry_mono">أُحادي</string>
 </resources>
diff --git a/res/values-as-rIN/qcomstrings.xml b/res/values-as-rIN/qcomstrings.xml
index b2bf161a3..368230e2a 100644
--- a/res/values-as-rIN/qcomstrings.xml
+++ b/res/values-as-rIN/qcomstrings.xml
@@ -131,7 +131,6 @@
   <!-- Settings screen, Select Redeye Reduction -->
   <string name="pref_camera_redeyereduction_title">ৰেড আই হ্ৰাসকৰণ</string>
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">উচ্চ-ফ্ৰেমৰেট ৰেকৰ্ডিং সমৰ্থিত নহয় যেতিয়া সুস্থিৰকৰণ/সময় লেপ্স/HDR ব্যৱহাৰ কৰা হয়।</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -310,11 +309,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">চেনচৰ HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">মাল্টিফ্ৰেম HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR ৰ বাবে 1x ফ্ৰেম আৱশ্যক</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">ভিডিঅ\' ৰোটেচন</string>
@@ -336,9 +330,13 @@
   <string name="all_in_focus">অল ইন ফোকাচ</string>
   <string name="refocus_toast">অন্তিমখন ফটো পুনঃ-ফোকাচ কৰিবলৈ ইয়াত টেপ কৰক</string>
   <!-- Help menu strings -->
+  <string name="pref_camera2_mono_only_entry_off">অফ</string>
   <string name="pref_camera2_mono_preview_entry_off">অফ</string>
   <string name="pref_camera2_clearsight_entry_off">অফ</string>
   <string name="pref_camera2_mpo_entry_off">অফ</string>
+  <string name="pref_camera2_makeup_entry_off">অফ</string>
   <string name="pref_camera2_noise_reduction_entry_off">অফ</string>
+  <string name="pref_camera2_trackingfocus_entry_off">অফ</string>
   <string name="pref_camera2_shutter_sound_entry_off">অফ</string>
+  <string name="pref_camera2_initial_camera_entry_mono">ম’ন’</string>
 </resources>
diff --git a/res/values-ast-rES/qcomstrings.xml b/res/values-ast-rES/qcomstrings.xml
index bd1d888e7..5bf308587 100644
--- a/res/values-ast-rES/qcomstrings.xml
+++ b/res/values-ast-rES/qcomstrings.xml
@@ -145,7 +145,6 @@
   <string name="pref_camera_selfiemirror_title" translatable="true">Espeyu d\'autoretratu</string>
   <string name="pref_camera_selfiemirror_entry_enable">Habilitar</string>
   <string name="pref_camera_selfiemirror_entry_disable">Deshabilitar</string>
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -299,10 +298,6 @@
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <string name="pref_camera_hdr_mode_entry_sensor">Sensor HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Voltéu de videu</string>
@@ -345,6 +340,7 @@
   <string name="pref_camera2_camera2_title">Mou Camera2</string>
   <string name="pref_camera2_camera2_entry_enable">Habilitar</string>
   <string name="pref_camera2_mono_only_title">Namái mono</string>
+  <string name="pref_camera2_mono_only_entry_off">Non</string>
   <string name="pref_camera2_mono_preview_title">Previsualización mono</string>
   <string name="pref_camera2_mono_preview_entry_on">Sí</string>
   <string name="pref_camera2_mono_preview_entry_off">Non</string>
@@ -354,10 +350,12 @@
   <string name="pref_camera2_mpo_title">Formatu MPO</string>
   <string name="pref_camera2_mpo_entry_on">Sí</string>
   <string name="pref_camera2_mpo_entry_off">Non</string>
+  <string name="pref_camera2_makeup_entry_off">Non</string>
   <string name="pref_camera2_noise_reduction_title">Reducción de ruíu</string>
   <string name="pref_camera2_noise_reduction_entry_off">Non</string>
   <string name="pref_camera2_noise_reduction_entry_high_quality">Calidá alta</string>
   <string name="pref_camera2_videosnap_entry_enable">Habilitar</string>
+  <string name="pref_camera2_trackingfocus_entry_off">Non</string>
   <string name="pref_camera_scenemode_entry_bestpicture">La meyor semeya</string>
   <string name="bestpicture_done">FECHO</string>
   <string name="bestpicture_at_least_one_picture">Tien d\'esbillase polo menos una semeya.</string>
diff --git a/res/values-az-rAZ/qcomstrings.xml b/res/values-az-rAZ/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-az-rAZ/qcomstrings.xml
+++ b/res/values-az-rAZ/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-be-rBY/qcomstrings.xml b/res/values-be-rBY/qcomstrings.xml
index 77396f68d..9e01db3c2 100644
--- a/res/values-be-rBY/qcomstrings.xml
+++ b/res/values-be-rBY/qcomstrings.xml
@@ -131,7 +131,6 @@
   <!-- Settings screen, Select Redeye Reduction -->
   <string name="pref_camera_redeyereduction_title">Змяншэнне эфекту чырвоных вачэй</string>
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">Паскораная здымка не падтрымваецца пры ўлучанай стабілізацыі выявы, улучаным HDR ці ў рэжыме запаволенай здымкі.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -310,11 +309,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">Датчык HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">Шматкадравы HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR патрабуе 1 кадр</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Паварот відэа</string>
@@ -336,9 +330,13 @@
   <string name="all_in_focus">Усё ў фокусе</string>
   <string name="refocus_toast">Каб перафакусаваць апошняе фота, націсні тут</string>
   <!-- Help menu strings -->
+  <string name="pref_camera2_mono_only_entry_off">Адключана</string>
   <string name="pref_camera2_mono_preview_entry_off">Адключана</string>
   <string name="pref_camera2_clearsight_entry_off">Адключана</string>
   <string name="pref_camera2_mpo_entry_off">Адключана</string>
+  <string name="pref_camera2_makeup_entry_off">Адключана</string>
   <string name="pref_camera2_noise_reduction_entry_off">Адключана</string>
+  <string name="pref_camera2_trackingfocus_entry_off">Адключана</string>
   <string name="pref_camera2_shutter_sound_entry_off">Адключана</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Ч/Б</string>
 </resources>
diff --git a/res/values-bg/qcomstrings.xml b/res/values-bg/qcomstrings.xml
index a551ab272..db0f66c13 100644
--- a/res/values-bg/qcomstrings.xml
+++ b/res/values-bg/qcomstrings.xml
@@ -160,8 +160,6 @@
   <string name="pref_camera_shuttersound_title" translatable="true">Зкук на затвора</string>
   <string name="pref_camera_shuttersound_entry_enable">Вкл.</string>
   <string name="pref_camera_shuttersound_entry_disable">Изкл.</string>
-  <!-- Default mce setting. Do not translate. -->
-  <string name="pref_camera_mce_default">активирано</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">Запис на бавно движение не се поддържа при използване на Стабилизация/Изтичащо време/HDR.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -365,11 +363,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">Сензор HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">Рамка HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR необходима е 1 x рамка</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Видео завъртане</string>
@@ -428,6 +421,7 @@
   <string name="pref_camera2_camera2_entry_enable">Разрешено</string>
   <string name="pref_camera2_camera2_entry_disable">Деактивирай</string>
   <string name="pref_camera2_mono_only_title">Моно само</string>
+  <string name="pref_camera2_mono_only_entry_off">Изкл.</string>
   <string name="pref_camera2_mono_preview_title">Моно визуализация</string>
   <string name="pref_camera2_mono_preview_entry_on">Включване</string>
   <string name="pref_camera2_mono_preview_entry_off">Изкл.</string>
@@ -439,6 +433,7 @@
   <string name="pref_camera2_mpo_entry_on">Вкл.</string>
   <string name="pref_camera2_mpo_entry_off">Изкл.</string>
   <string name="pref_camera2_makeup_title">Грим</string>
+  <string name="pref_camera2_makeup_entry_off">Изкл.</string>
   <string name="pref_camera2_noise_reduction_title">Намаляване на шума</string>
   <string name="pref_camera2_noise_reduction_entry_off">Изкл.</string>
   <string name="pref_camera2_noise_reduction_entry_fast">Бързо</string>
@@ -447,10 +442,12 @@
   <string name="pref_camera2_videosnap_entry_enable">Разрешено</string>
   <string name="pref_camera2_videosnap_entry_disable">Деактивирай</string>
   <string name="pref_camera2_trackingfocus_title">Проследяващ фокус</string>
+  <string name="pref_camera2_trackingfocus_entry_off">Изкл.</string>
   <string name="pref_camera_scenemode_entry_bestpicture">Най-добра снимка</string>
   <string name="bestpicture_done">ГОТОВО</string>
   <string name="bestpicture_at_least_one_picture">Най-малко една снимка трябва да бъде избрана.</string>
   <string name="pref_camera2_shutter_sound_entry_on">Вкл.</string>
   <string name="pref_camera2_shutter_sound_entry_off">Изкл.</string>
   <string name="pref_camera2_shutter_sound_title">Зкук на затвора</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Моно</string>
 </resources>
diff --git a/res/values-bn-rBD/qcomstrings.xml b/res/values-bn-rBD/qcomstrings.xml
index dcf35bf29..53cedfa2a 100644
--- a/res/values-bn-rBD/qcomstrings.xml
+++ b/res/values-bn-rBD/qcomstrings.xml
@@ -96,7 +96,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -173,10 +172,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-br-rFR/qcomstrings.xml b/res/values-br-rFR/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-br-rFR/qcomstrings.xml
+++ b/res/values-br-rFR/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-bs-rBA/qcomstrings.xml b/res/values-bs-rBA/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-bs-rBA/qcomstrings.xml
+++ b/res/values-bs-rBA/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-ca/qcomstrings.xml b/res/values-ca/qcomstrings.xml
index 1e3f88cd6..53440a454 100644
--- a/res/values-ca/qcomstrings.xml
+++ b/res/values-ca/qcomstrings.xml
@@ -160,8 +160,6 @@
   <string name="pref_camera_shuttersound_title" translatable="true">So de l\'obturador</string>
   <string name="pref_camera_shuttersound_entry_enable">Habilitat</string>
   <string name="pref_camera_shuttersound_entry_disable">Deshabilitat</string>
-  <!-- Default mce setting. Do not translate. -->
-  <string name="pref_camera_mce_default">activa</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">L\'enregistrament a alta velocitat no està suportat quan s\'utilitza Estabilització/TimeLapse/HDR.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -365,11 +363,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">Sensor HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">Multi-marc HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">L\'HDR necessita un marc 1x</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Rotació del vídeo</string>
@@ -428,6 +421,7 @@
   <string name="pref_camera2_camera2_entry_enable">Habilita</string>
   <string name="pref_camera2_camera2_entry_disable">Deshabilita</string>
   <string name="pref_camera2_mono_only_title">Només Mono</string>
+  <string name="pref_camera2_mono_only_entry_off">Desactivat</string>
   <string name="pref_camera2_mono_preview_title">Vista prèvia Mono</string>
   <string name="pref_camera2_mono_preview_entry_on">Sí</string>
   <string name="pref_camera2_mono_preview_entry_off">Desactivat</string>
@@ -439,6 +433,7 @@
   <string name="pref_camera2_mpo_entry_on">Sí</string>
   <string name="pref_camera2_mpo_entry_off">Desactivat</string>
   <string name="pref_camera2_makeup_title">Maquillatge</string>
+  <string name="pref_camera2_makeup_entry_off">Desactivat</string>
   <string name="pref_camera2_noise_reduction_title">Reducció de soroll</string>
   <string name="pref_camera2_noise_reduction_entry_off">Desactivat</string>
   <string name="pref_camera2_noise_reduction_entry_fast">Ràpid</string>
@@ -447,10 +442,12 @@
   <string name="pref_camera2_videosnap_entry_enable">Habilita</string>
   <string name="pref_camera2_videosnap_entry_disable">Deshabilita</string>
   <string name="pref_camera2_trackingfocus_title">Seguiment del focus</string>
+  <string name="pref_camera2_trackingfocus_entry_off">Desactivat</string>
   <string name="pref_camera_scenemode_entry_bestpicture">Millor fotografia</string>
   <string name="bestpicture_done">FET</string>
   <string name="bestpicture_at_least_one_picture">S\'ha de escollir almenys una imatge.</string>
   <string name="pref_camera2_shutter_sound_entry_on">Sí</string>
   <string name="pref_camera2_shutter_sound_entry_off">Desactivat</string>
   <string name="pref_camera2_shutter_sound_title">So de l\'obturador</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Mono</string>
 </resources>
diff --git a/res/values-cs/qcomstrings.xml b/res/values-cs/qcomstrings.xml
index cdeb14a11..4be98359d 100644
--- a/res/values-cs/qcomstrings.xml
+++ b/res/values-cs/qcomstrings.xml
@@ -160,7 +160,6 @@
   <string name="pref_camera_shuttersound_title" translatable="true">Zvuk závěrky</string>
   <string name="pref_camera_shuttersound_entry_enable">Povoleno</string>
   <string name="pref_camera_shuttersound_entry_disable">Zakázáno</string>
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">Vysoká rychlost snímání (zpomalený pohyb) nelze použít pro stabilizátor / časosběr / HDR.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -364,11 +363,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">Senzor HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">Vícepolíčkové HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR vyžaduje 1x políčko</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Rotace video</string>
@@ -427,6 +421,7 @@
   <string name="pref_camera2_camera2_entry_enable">Použít</string>
   <string name="pref_camera2_camera2_entry_disable">Nepoužít</string>
   <string name="pref_camera2_mono_only_title">Pouze Mono</string>
+  <string name="pref_camera2_mono_only_entry_off">Vypnuto</string>
   <string name="pref_camera2_mono_preview_title">Náhled Mono</string>
   <string name="pref_camera2_mono_preview_entry_on">Zapnout</string>
   <string name="pref_camera2_mono_preview_entry_off">Vypnuto</string>
@@ -438,6 +433,7 @@
   <string name="pref_camera2_mpo_entry_on">Zapnout</string>
   <string name="pref_camera2_mpo_entry_off">Vypnuto</string>
   <string name="pref_camera2_makeup_title">Makeup</string>
+  <string name="pref_camera2_makeup_entry_off">Vypnuto</string>
   <string name="pref_camera2_noise_reduction_title">Redukce šumu</string>
   <string name="pref_camera2_noise_reduction_entry_off">Vypnuto</string>
   <string name="pref_camera2_noise_reduction_entry_fast">Rychle</string>
@@ -446,10 +442,12 @@
   <string name="pref_camera2_videosnap_entry_enable">Použít</string>
   <string name="pref_camera2_videosnap_entry_disable">Zakázat</string>
   <string name="pref_camera2_trackingfocus_title">Sledování zaostření</string>
+  <string name="pref_camera2_trackingfocus_entry_off">Vypnuto</string>
   <string name="pref_camera_scenemode_entry_bestpicture">Nejlepší obraz</string>
   <string name="bestpicture_done">HOTOVO</string>
   <string name="bestpicture_at_least_one_picture">Musí být vybrán alespoň jeden obrázek.</string>
   <string name="pref_camera2_shutter_sound_entry_on">Zapnuto</string>
   <string name="pref_camera2_shutter_sound_entry_off">Vypnuto</string>
   <string name="pref_camera2_shutter_sound_title">Zvuk závěrky</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Černobílý</string>
 </resources>
diff --git a/res/values-csb-rPL/qcomstrings.xml b/res/values-csb-rPL/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-csb-rPL/qcomstrings.xml
+++ b/res/values-csb-rPL/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-cy/cm_strings.xml b/res/values-cy/cm_strings.xml
index ebca1dc44..a45d29f63 100644
--- a/res/values-cy/cm_strings.xml
+++ b/res/values-cy/cm_strings.xml
@@ -29,6 +29,8 @@
   <!-- Power shutter -->
   <!-- Max brightness -->
   <!-- Touch focus duration -->
+  <string name="pref_camera_focustime_entry_0">0e</string>
+  <string name="pref_camera_focustime_entry_10">10e</string>
   <!-- Shutter speed -->
   <!-- Advanced options -->
 </resources>
diff --git a/res/values-cy/qcomstrings.xml b/res/values-cy/qcomstrings.xml
index eb31e645f..11f042209 100644
--- a/res/values-cy/qcomstrings.xml
+++ b/res/values-cy/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
@@ -173,5 +168,7 @@
   <!-- Continuous shot enable message -->
   <!-- Advanced features enable message -->
   <!-- The alas of CameraActivity for gesture operation -->
+  <string name="text_tsmakeup_alert_quit">Diddymu</string>
   <!-- Help menu strings -->
+  <string name="help_menu_ok">Iawn</string>
 </resources>
diff --git a/res/values-cy/strings.xml b/res/values-cy/strings.xml
index e25adc394..6cb0e5683 100644
--- a/res/values-cy/strings.xml
+++ b/res/values-cy/strings.xml
@@ -18,6 +18,7 @@
   <!-- The name of the Android Camera application. [CHAR LIMIT=16] -->
   <!-- The label for the Video Camera activity. [CHAR LIMIT=16] -->
   <!-- Used to format short video duration in Details dialog. minutes:seconds e.g. 00:30 -->
+  <string name="details_ms">%1$02d:%2$02d</string>
   <!-- Used to format video duration in Details dialog. hours:minutes:seconds e.g. 0:21:30 -->
   <!-- Displayed in the title of the dialog for things to do with a picture
              that is to be "set as" (e.g. set as contact photo or set as wallpaper) -->
@@ -83,6 +84,7 @@
   <!-- Screen display message during image capture to indicate that the capture is in progress, like during HDR+. [CHAR LIMIT=20] -->
   <!-- Settings screen, camera selection dialog title. Users can select a camera from the phone (front-facing or back-facing). [CHAR LIMIT=20] -->
   <!-- In select camera setting, back facing camera. [CHAR LIMIT=14] -->
+  <string name="pref_camera_id_entry_back">Nôl</string>
   <!-- In select camera setting, front-facing camera. [CHAR LIMIT=14] -->
   <!-- Settings screen, setting title text -->
   <!--  Label for record location preference [CHAR LIMIT=50] -->
@@ -151,6 +153,7 @@
   <!-- Settings menu countdown timer 1 second [CHAR LIMIT=50] -->
   <!-- Settings menu countdown timer 3 seconds [CHAR LIMIT=50] -->
   <!-- Settings menu countdown timer 10 seconds [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_ten">10 EILIAD</string>
   <!-- Settings menu countdown timer 15 seconds [CHAR LIMIT=50] -->
   <!-- Toast after trying to select a setting that is not allowed to change in scene mode [CHAR LIMIT=NONE] -->
   <!-- Toast after enable HDR function to inform Continuous Shot has disabled -->
@@ -170,6 +173,7 @@
   <!-- switch camera label back [CHAR LIMIT=60] -->
   <!-- switch camera label front [CHAR LIMIT=60] -->
   <!-- Dialog "OK" button. Dismisses dialog. -->
+  <string name="dialog_ok">Iawn</string>
   <!-- Low-memory dialog message [CHAR LIMIT=NONE] -->
   <!-- Camera format string for new image files. Passed to java.text.SimpleDateFormat. -->
   <!-- Video Camera format string for new video files. Passed to java.text.SimpleDateFormat. -->
@@ -202,6 +206,7 @@
   <!-- A button in effect setting popup to clear the effect. [CHAR LIMIT=26] -->
   <!-- Title of category for silly face effects. [CHAR LIMIT=26] -->
   <!-- Title of category for background replacement effects. [CHAR LIMIT=26] -->
+  <string name="effect_background">CEFNDIR</string>
   <!-- The shutter button. [CHAR LIMIT = NONE] -->
   <!-- The menu button. [CHAR LIMIT = NONE] -->
   <!-- The mode picker to switch between camera, video and panorama. [CHAR LIMIT = NONE] -->
@@ -219,8 +224,10 @@ CHAR LIMIT = NONE] -->
   <!-- Default text for a button that can be toggled on and off. -->
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_500">0.5 eiliad</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_1500">1.5 eiliad</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
@@ -228,12 +235,17 @@ CHAR LIMIT = NONE] -->
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_10000">10 eiliad</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_12000">12 eiliad</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_30000">0.5 munud</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_60000">1 munud</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_90000">1.5 munud</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
@@ -241,12 +253,17 @@ CHAR LIMIT = NONE] -->
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_600000">10 munud</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_720000">12 munud</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_1800000">0.5 awr</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_3600000">1 awr</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_5400000">1.5 awr</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
@@ -254,7 +271,9 @@ CHAR LIMIT = NONE] -->
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_36000000">10 awr</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_43200000">12 awr</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
   <!-- Seconds: a unit of time for time lapse intervals. [CHAR LIMIT = 20] -->
diff --git a/res/values-da/qcomstrings.xml b/res/values-da/qcomstrings.xml
index 420e30bf0..4cffd555b 100644
--- a/res/values-da/qcomstrings.xml
+++ b/res/values-da/qcomstrings.xml
@@ -160,7 +160,6 @@
   <string name="pref_camera_shuttersound_title" translatable="true">Lukkerlyd</string>
   <string name="pref_camera_shuttersound_entry_enable">Aktiveret</string>
   <string name="pref_camera_shuttersound_entry_disable">Deaktiveret</string>
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">Optagelse med høj billedfrekvens er ikke understøttet under Stabilisering/Tidsforløb/HDR.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -364,11 +363,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">HDR sensor</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">Multi-billed HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR skal bruge 1xbillede</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Video rotation</string>
@@ -427,6 +421,7 @@
   <string name="pref_camera2_camera2_entry_enable">Aktivér</string>
   <string name="pref_camera2_camera2_entry_disable">Deaktivér</string>
   <string name="pref_camera2_mono_only_title">Kun mono</string>
+  <string name="pref_camera2_mono_only_entry_off">Fra</string>
   <string name="pref_camera2_mono_preview_title">Eksempel på Mono</string>
   <string name="pref_camera2_mono_preview_entry_on">Til</string>
   <string name="pref_camera2_mono_preview_entry_off">Fra</string>
@@ -438,6 +433,7 @@
   <string name="pref_camera2_mpo_entry_on">Til</string>
   <string name="pref_camera2_mpo_entry_off">Fra</string>
   <string name="pref_camera2_makeup_title">Makeup</string>
+  <string name="pref_camera2_makeup_entry_off">Fra</string>
   <string name="pref_camera2_noise_reduction_title">Støjreduktion</string>
   <string name="pref_camera2_noise_reduction_entry_off">Fra</string>
   <string name="pref_camera2_noise_reduction_entry_fast">Hurtig</string>
@@ -446,10 +442,12 @@
   <string name="pref_camera2_videosnap_entry_enable">Aktivér</string>
   <string name="pref_camera2_videosnap_entry_disable">Deaktivér</string>
   <string name="pref_camera2_trackingfocus_title">Sporingsfokus</string>
+  <string name="pref_camera2_trackingfocus_entry_off">Fra</string>
   <string name="pref_camera_scenemode_entry_bestpicture">Bedste billede</string>
   <string name="bestpicture_done">UDFØRT</string>
   <string name="bestpicture_at_least_one_picture">Mindst ét billede skal vælges.</string>
   <string name="pref_camera2_shutter_sound_entry_on">Til</string>
   <string name="pref_camera2_shutter_sound_entry_off">Fra</string>
   <string name="pref_camera2_shutter_sound_title">Lukkerlyd</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Mono</string>
 </resources>
diff --git a/res/values-de/qcomstrings.xml b/res/values-de/qcomstrings.xml
index 9c9212bd7..b53977811 100644
--- a/res/values-de/qcomstrings.xml
+++ b/res/values-de/qcomstrings.xml
@@ -160,7 +160,6 @@
   <string name="pref_camera_shuttersound_title" translatable="true">Auslöser-Ton</string>
   <string name="pref_camera_shuttersound_entry_enable">Aktiviert</string>
   <string name="pref_camera_shuttersound_entry_disable">Deaktiviert</string>
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">Aufnahmen mit hoher Bildrate bzw. in Zeitlupe werden bei Bildstabilisierung, Zeitraffer und HDR nicht unterstützt.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -364,11 +363,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">Sensor-HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">Mehrbild-HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR benötigt 1x Bild</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Videodrehung</string>
@@ -427,6 +421,7 @@
   <string name="pref_camera2_camera2_entry_enable">Aktivieren</string>
   <string name="pref_camera2_camera2_entry_disable">Deaktivieren</string>
   <string name="pref_camera2_mono_only_title">Nur Mono</string>
+  <string name="pref_camera2_mono_only_entry_off">Aus</string>
   <string name="pref_camera2_mono_preview_title">Mono-Vorschau</string>
   <string name="pref_camera2_mono_preview_entry_on">An</string>
   <string name="pref_camera2_mono_preview_entry_off">Aus</string>
@@ -438,6 +433,7 @@
   <string name="pref_camera2_mpo_entry_on">An</string>
   <string name="pref_camera2_mpo_entry_off">Aus</string>
   <string name="pref_camera2_makeup_title">Make-up</string>
+  <string name="pref_camera2_makeup_entry_off">Aus</string>
   <string name="pref_camera2_noise_reduction_title">Rauschunterdrückung</string>
   <string name="pref_camera2_noise_reduction_entry_off">Aus</string>
   <string name="pref_camera2_noise_reduction_entry_fast">Schnell</string>
@@ -446,10 +442,12 @@
   <string name="pref_camera2_videosnap_entry_enable">Aktivieren</string>
   <string name="pref_camera2_videosnap_entry_disable">Deaktivieren</string>
   <string name="pref_camera2_trackingfocus_title">Fokusnachführung</string>
+  <string name="pref_camera2_trackingfocus_entry_off">Aus</string>
   <string name="pref_camera_scenemode_entry_bestpicture">Optimales Bild</string>
   <string name="bestpicture_done">FERTIG</string>
   <string name="bestpicture_at_least_one_picture">Es muss mindestens ein Bild ausgewählt werden.</string>
   <string name="pref_camera2_shutter_sound_entry_on">An</string>
   <string name="pref_camera2_shutter_sound_entry_off">Aus</string>
   <string name="pref_camera2_shutter_sound_title">Auslöser-Ton</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Schwarzweiß</string>
 </resources>
diff --git a/res/values-el/qcomstrings.xml b/res/values-el/qcomstrings.xml
index cf524d09b..5dadbbdfe 100644
--- a/res/values-el/qcomstrings.xml
+++ b/res/values-el/qcomstrings.xml
@@ -93,21 +93,34 @@
   <string name="pref_camera_manual_focus_entry_off">Ανενεργή</string>
   <!-- Instant Capture entry -->
   <string name="pref_camera_instant_capture_title" translatable="true">Άμεση καταγραφή</string>
+  <string name="pref_camera_instant_capture_entry_aggressive_aec" translatable="true">Επιθετική AEC</string>
+  <string name="pref_camera_instant_capture_entry_fast_aec" translatable="true">Γρήγορη AEC</string>
+  <string name="pref_camera_instant_capture_entry_disable" translatable="true">Ανενεργή</string>
   <!-- Instant Capture entry values -->
   <!-- Settings screen, ZSL location dialog choices -->
   <string name="pref_camera_zsl_entry_off">Ανενεργή</string>
+  <string name="pref_camera_zsl_entry_on">Ενεργή</string>
   <!-- The message is shown in toast when HDR or scene mode is enabled -->
+  <string name="hdr_enable_message">Το HDR είναι ενεργό, υποστηρίζεται μόνο η αυτόματη λειτουργία σκηνής</string>
+  <string name="scene_enable_message">Το HDR δεν υποστηρίζεται σε λειτουργία σκηνής διαφορετική από την αυτόματη</string>
   <!-- Settings screen, Video HDR location dialog choices -->
   <string name="pref_camera_video_hdr_entry_off">Ανενεργή</string>
+  <string name="pref_camera_video_hdr_entry_on">Ενεργό</string>
   <!-- Settings screen, CDS location dialog choices -->
   <string name="pref_camera_cds_entry_off">Ανενεργή</string>
+  <string name="pref_camera_cds_entry_on">Ενεργό</string>
   <string name="pref_camera_cds_entry_auto">Αυτόματη</string>
   <!-- Settings screen, video CDS location dialog choices -->
   <string name="pref_camera_video_cds_entry_off">Ανενεργή</string>
+  <string name="pref_camera_video_cds_entry_on">Ενεργό</string>
   <string name="pref_camera_video_cds_entry_auto">Αυτόματη</string>
   <!-- Settings screen, TNR location dialog choices -->
+  <string name="pref_camera_tnr_entry_disable">Ανενεργό</string>
+  <string name="pref_camera_tnr_entry_enable">Ενεργό</string>
   <!-- Settings screen, TNR location dialog choices -->
   <!-- Settings screen, video TNR location dialog choices -->
+  <string name="pref_camera_video_tnr_entry_disable">Ανενεργό</string>
+  <string name="pref_camera_video_tnr_entry_enable">Ενεργό</string>
   <!-- Settings screen, video TNR location dialog choices -->
   <!-- Settings screen, setting title text for Video HDR-->
   <string name="pref_camera_video_hdr_title">Video HDR</string>
@@ -128,16 +141,25 @@
   <string name="pref_camera_facedetection_title">Εντοπισμός προσώπου</string>
   <!-- Settings menu, Face Detection choices -->
   <string name="pref_camera_facedetection_entry_off">Ανενεργή</string>
+  <string name="pref_camera_facedetection_entry_on">Ενεργός</string>
   <!-- Default Selfie Flash setting. -->
   <!-- Settings screen, Selfie Flash Detection -->
   <string name="pref_selfie_flash_title">Φλας σέλφι</string>
   <!-- Settings menu, Selfie Flash choices -->
   <string name="pref_selfie_flash_entry_off">Ανενεργή</string>
+  <string name="pref_selfie_flash_entry_on">Ενεργό</string>
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <string name="pref_camera_redeyereduction_title">Μείωση κόκκινων ματιών</string>
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
+  <string name="pref_camera_redeyereduction_entry_enable">Ενεργή</string>
+  <string name="pref_camera_redeyereduction_entry_disable">Ανενεργή</string>
+  <string name="pref_camera_selfiemirror_title" translatable="true">Καθρέφτης selfie</string>
+  <string name="pref_camera_selfiemirror_entry_enable">Ενεργός</string>
+  <string name="pref_camera_selfiemirror_entry_disable">Ανενεργός</string>
+  <string name="pref_camera_shuttersound_title" translatable="true">Ήχος κλείστρου</string>
+  <string name="pref_camera_shuttersound_entry_enable">Ενεργός</string>
+  <string name="pref_camera_shuttersound_entry_disable">Ανενεργός</string>
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">Η υψηλή ταχύτητα/αργή κίνηση δεν υποστηρίζεται με Σταθεροποίηση/Time lapse/HDR.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -151,14 +173,20 @@
   <!-- The message is shown in dialog when the app encounters an unsupported video resolution-->
   <string name="error_app_unsupported">Μη υποστηριζόμενη ανάλυση βίντεο για αυτόν τον τύπο κωδικοποιητή</string>
   <!-- The message is shown in dialog when the app encounters an unsupported video profile-->
+  <string name="error_app_unsupported_profile">Μη υποστηριζόμενο προφίλ βίντεο</string>
   <!--The message is shown in dialog when the raw snapshot is selected in zsl mode-->
   <string name="error_app_unsupported_raw">Δεν υποστηρίζεται Raw τύπος εικόνας κατά την λειτουργία Μηδενικής καθυστέρησης κλείστρου. Επιλέξτε JPEG</string>
   <!-- Settings screen, AE bracketing and HDR location dialog choices -->
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">Bracketing αυτόματης έκθεσης</string>
   <string name="pref_camera_ae_bracket_hdr_title">Bracketing αυτόματης έκθεσης</string>
+  <string name="pref_camera_ae_bracket_hdr_entry_on">Ενεργό</string>
+  <string name="err_app_unsupport_ae_bracket_code">Το Bracketing ΑΕ δεν υποστηρίζεται ακόμη</string>
   <!-- The messsage shown if user selects a snapshot resolution lower than the current video size. -->
+  <string name="snapshot_lower_than_video">Το μέγεθος στιγμιότυπου βίντεο είναι μικρότερο από το μέγεθος βίντεο, κλείδωμα στο μέγεθος βίντεο. Παρακαλώ επιλέξτε ένα μέγεθος μεγαλύτερο ή ίσο με το τρέχον μέγεθος βίντεο.</string>
   <!-- The messsage shown if user selects a snapshot resolution in low power mode. -->
+  <string name="snapshotsize_low_powermode">Δεν υποστηρίζεται η αλλαγή μεγέθους φωτογραφίας κατά την λειτουργία Χαμηλής ισχύος, θα ληφθεί στιγμιότυπο στο μέγεθος του βίντεο. Παρακαλώ επιλέξτε την λειτουργία Κανονικής ισχύος για να μπορείτε να αλλάξετε το μέγεθος της εικόνας.</string>
   <!-- The messsage shown if user tries to take snapshot during D1/QCIF resolution. -->
+  <string name="snapshot_qcif_and_d1">Υποστηρίζεται μόνο στιγμιότυπο στο μέγεθος του βίντεο για αυτή την ανάλυση.</string>
   <!-- Default hfr setting. Do not translate. -->
   <!-- Settings screen, Select hfr title -->
   <string name="pref_camera_hfr_title">Εγγραφή υψηλού ρυθμού καρέ</string>
@@ -185,11 +213,13 @@
   <!-- Settings screen, Select See More title -->
   <!-- Settings screen, see more radio button choices -->
   <string name="pref_camera_see_more_entry_off">Ανενεργή</string>
+  <string name="pref_camera_see_more_entry_on">Ενεργό</string>
   <!-- see more entry values. Do not translate. -->
   <!-- Denoise Settings screen, setting title text -->
   <string name="pref_camera_denoise_title">Αφαίρεση θορύβου</string>
   <!-- Denoise Settings screen, Record location dialog choices -->
   <string name="pref_camera_denoise_entry_off">Ανενεργή</string>
+  <string name="pref_camera_denoise_entry_on">Ενεργό</string>
   <!-- Default iso setting. Do not translate. -->
   <!-- Settings screen, Select Iso title -->
   <string name="pref_camera_iso_title">ISO</string>
@@ -211,6 +241,7 @@
   <string name="pref_camera_antibanding_entry_2">60 Hz (ΗΠΑ)</string>
   <string name="pref_camera_antibanding_entry_3">Αυτόματη</string>
   <!-- Default color effect setting. -->
+  <string name="pref_camera_filter_mode_entry_on">Ενεργό</string>
   <string name="pref_camera_filter_mode_entry_off">Ανενεργή</string>
   <!-- Settings screen, Select Color effect title -->
   <string name="pref_camera_coloreffect_title">Εφέ χρώματος</string>
@@ -234,14 +265,17 @@
   <string name="pref_camera_coloreffect_entry_greentint">Πράσινη απόχρωση</string>
   <!-- Settings screen, Touch AF/AEC dialog radio button choices -->
   <string name="pref_camera_touchafaec_entry_off">Ανενεργή</string>
+  <string name="pref_camera_touchafaec_entry_on">Ενεργό</string>
   <!-- Select IS title -->
   <string name="pref_camera_dis_title">Σταθεροποίηση βίντεο</string>
   <!-- DIS choices -->
   <string name="pref_camera_dis_entry_off">Ανενεργή</string>
+  <string name="pref_camera_dis_entry_on">Ενεργό</string>
   <!-- Select Face Recognition title -->
   <string name="pref_camera_facerc_title">Εντοπισμός προσώπου</string>
   <!-- Face Recognition choices -->
   <string name="pref_camera_facerc_entry_off">Ανενεργή</string>
+  <string name="pref_camera_facerc_entry_on">Ενεργό</string>
   <!-- Settings screen, Multiple levels entries -->
   <string name="pref_camera_sharpness_entry_level0">Επίπεδο 0</string>
   <string name="pref_camera_sharpness_entry_level1">Επίπεδο 1</string>
@@ -292,10 +326,15 @@
   <!-- Settings screen, Picture quality title -->
   <string name="pref_camera_jpegquality_title">Ποιότητα εικόνας</string>
   <!-- Settings screen, Picture quality dialog radio button choices -->
+  <string name="pref_camera_jpegquality_entry_0">Χαμηλή</string>
+  <string name="pref_camera_jpegquality_entry_1">Κανονική</string>
+  <string name="pref_camera_jpegquality_entry_2">Υψηλή</string>
   <!-- Default auto histogram setting. Do not translate. -->
   <!-- Settings screen, Select Histogram title -->
   <string name="pref_camera_histogram_title">Ιστόγραμμα</string>
   <!-- Settings screen, Histogram radio button choices -->
+  <string name="pref_camera_histogram_entry_enable">Ενεργό</string>
+  <string name="pref_camera_histogram_entry_disable">Ανενεργό</string>
   <!-- Histogram entry values. Do not translate. -->
   <!-- Default auto scene detection setting. -->
   <!-- Settings screen, Select Auto Scene Detection -->
@@ -303,7 +342,9 @@
   <!-- Settings menu, auto scene detection choices -->
   <string name="pref_camera_scenedetect_entry_off">Ανενεργή</string>
   <!-- Scene detection set to on - supports backlight and snow cloudy detection. -->
+  <string name="pref_camera_scenedetect_entry_on">Ενεργό</string>
   <!-- Toast showing error if invalid size selected for  time lapse  [CHAR LIMIT=65] -->
+  <string name="time_lapse_error">Μη έγκυρο μέγεθος βίντεο για καταγραφή time-lapse.</string>
   <!-- longshot value -->
   <string name="pref_camera_longshot_title">Συνεχής λήψη</string>
   <string name="msg_cancel_longshot_for_limited_memory">Η μνήμη εξαντλείται, ακυρώνεται η συνεχής λήψη</string>
@@ -312,6 +353,8 @@
   <!-- Settings screen, setting title text for Auto HDR-->
   <string name="pref_camera_auto_hdr_title">Αυτόματο HDR</string>
   <!-- Settings screen, Auto HDR location dialog choices -->
+  <string name="pref_camera_auto_hdr_entry_enable">Ενεργό</string>
+  <string name="pref_camera_auto_hdr_entry_disable">Ανενεργό</string>
   <!-- toast message for storage location switch -->
   <string name="on_switch_save_path_to_sdcard">Ο εσωτερικός χώρος αποθήκευσης δεν επαρκεί, αλλαγή χώρου αποθήκευσης σε κάρτα SD</string>
   <!-- Settings screen, Selectable HDR mode title -->
@@ -320,15 +363,11 @@
   <string name="pref_camera_hdr_mode_entry_sensor">HDR αισθητήρα</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">HDR πολλαπλών καρέ</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR με 1 καρέ</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Περιστροφή βίντεο</string>
   <!--Menu, video rotation label-->
+  <string name="pref_camera_video_rotation_label">ΠΕΡΙΣΤΡΟΦΗ ΤΟΥ ΒΙΝΤΕΟ</string>
   <!-- Settings screen, Video rotation dialog radio button choices -->
   <string name="pref_camera_video_rotation_entry_0">0 μοίρες</string>
   <string name="pref_camera_video_rotation_entry_90">90 μοίρες</string>
@@ -342,13 +381,78 @@
   <string name="advance_feature_enable_msg">Η συνεχής λήψη δεν υποστηρίζεται όταν είναι ενεργοποιημένες οι προηγμένες δυνατότητες</string>
   <!-- The alas of CameraActivity for gesture operation -->
   <string name="camera_gesture_title">Εκκίνηση φωτογρ. μηχανής</string>
+  <string name="pref_camera_tsmakeup_title">Ωραιοποίηση</string>
+  <string name="pref_camera_tsmakeup_entry_on">Ενεργό</string>
   <string name="pref_camera_tsmakeup_entry_off">Ανενεργή</string>
+  <string name="pref_camera_tsmakeup_entry_low">Χαμηλή</string>
+  <string name="pref_camera_tsmakeup_entry_mid">Μέτρια</string>
+  <string name="pref_camera_tsmakeup_entry_high">Υψηλή</string>
+  <string name="pref_camera_tsmakeup_custom">Προσαρμοσμένη</string>
+  <string name="pref_camera_tsmakeup_level_whiten">Λεύκανση</string>
+  <string name="pref_camera_tsmakeup_level_clean">Μαλάκωση</string>
+  <string name="text_tsmakeup_alert_title">Προσοχή</string>
+  <string name="text_tsmakeup_alert_msg">Η ανίχνευση προσώπου πρέπει να είναι ενεργή για την χρήση της ωραιοποίησης. Θέλετε να συνεχίσετε;</string>
+  <string name="text_tsmakeup_alert_continue">Συνέχεια</string>
+  <string name="text_tsmakeup_alert_quit">Ακύρωση</string>
+  <string name="text_tsmakeup_beautify_toast">Ωραιοποίηση</string>
   <string name="all_in_focus">Όλα σε εστίαση</string>
   <string name="refocus_toast">Για επανεστίαση της τελευταίας φωτογραφίας, πατήστε εδώ</string>
+  <string name="refocus_prompt_message">Με το UbiFocus, η κάμερα σας θα τραβήξει 5 φωτογραφίες, κάθε φορά που πατάτε το πλήκτρο λήψης. Οι 5 φωτογραφίες θα ενωθούν σε 1 φωτογραφία, όπου τα πάντα είναι εστιασμένα. Μπορείτε να επανεστιάσετε, αφού τραβήξετε τη φωτογραφία.</string>
+  <string name="camera_thermal_shutdown">Το τηλέφωνο υπερθερμάνθηκε, κλείσιμο κάμερας.</string>
+  <string name="camera_server_died">Ο διακομιστής πολυμέσων πέθανε, κλείσιμο κάμερας.</string>
+  <string name="camera_unknown_error">Άγνωστο σφάλμα, κλείσιμο κάμερας.</string>
+  <string name="mute_button_desc">Πλήκτρο σίγασης</string>
   <!-- Help menu strings -->
+  <string name="help_menu_ok">OK</string>
+  <string name="help_menu_scene_mode_1">Επιλέξτε μία</string>
+  <string name="help_menu_scene_mode_2">Λειτουργία σκηνής</string>
+  <string name="help_menu_scene_mode_3">για καλύτερες φωτογραφίες</string>
+  <string name="help_menu_color_filter_1">Εφαρμογή χρώματος</string>
+  <string name="help_menu_color_filter_2">φίλτρα</string>
+  <string name="help_menu_color_filter_3">σε</string>
+  <string name="help_menu_color_filter_4">βελτίωση εικόνων</string>
+  <string name="help_menu_beautify_1">Βελτιωμένα πορτρέτα</string>
+  <string name="help_menu_beautify_2">μαζί με</string>
+  <string name="help_menu_beautify_3">Χαρακτηριστικό ωραιοποίησης</string>
+  <string name="help_menu_switcher_1">Εναλλαγή</string>
+  <string name="help_menu_switcher_2">μεταξύ</string>
+  <string name="help_menu_switcher_3">κάμερα, βίντεο και πανόραμα</string>
+  <string name="pref_camera2_camera2_title">Λειτουργία Camera2</string>
+  <string name="pref_camera2_camera2_entry_enable">Ενεργό</string>
+  <string name="pref_camera2_camera2_entry_disable">Ανενεργό</string>
+  <string name="pref_camera2_mono_only_title">Μόνο mono</string>
+  <string name="pref_camera2_mono_only_entry_on">Ενεργό</string>
+  <string name="pref_camera2_mono_only_entry_off">Aνενεργό</string>
+  <string name="pref_camera2_mono_preview_title">Προεπισκόπηση mono</string>
+  <string name="pref_camera2_mono_preview_entry_on">Ενεργό</string>
   <string name="pref_camera2_mono_preview_entry_off">Ανενεργή</string>
+  <string name="pref_camera2_clearsight_entry_on">Ενεργό</string>
   <string name="pref_camera2_clearsight_entry_off">Ανενεργή</string>
+  <string name="clearsight_capture_success">Λήψη ClearSight επιτυχής</string>
+  <string name="clearsight_capture_fail">Λήψη ClearSight απέτυχε</string>
+  <string name="pref_camera2_mpo_title">Μορφή MPO</string>
+  <string name="pref_camera2_mpo_entry_on">Ενεργό</string>
   <string name="pref_camera2_mpo_entry_off">Ανενεργή</string>
+  <string name="pref_camera2_makeup_title">Μακιγιάζ</string>
+  <string name="pref_camera2_makeup_entry_on">Ενεργό</string>
+  <string name="pref_camera2_makeup_entry_off">Aνενεργό</string>
+  <string name="pref_camera2_noise_reduction_title">Μείωση θορύβου</string>
   <string name="pref_camera2_noise_reduction_entry_off">Ανενεργή</string>
+  <string name="pref_camera2_noise_reduction_entry_fast">Γρήγορη</string>
+  <string name="pref_camera2_noise_reduction_entry_high_quality">Υψηλή ποιότητα</string>
+  <string name="pref_camera2_videosnap_title">Αυτόματο μέγεθος στιγμιότυπου οθόνης</string>
+  <string name="pref_camera2_videosnap_entry_enable">Ενεργό</string>
+  <string name="pref_camera2_videosnap_entry_disable">Ανενεργό</string>
+  <string name="pref_camera2_trackingfocus_title">Παρακολούθηση εστίασης</string>
+  <string name="pref_camera2_trackingfocus_entry_on">Ενεργή</string>
+  <string name="pref_camera2_trackingfocus_entry_off">Ανενεργή</string>
+  <string name="pref_camera_scenemode_entry_bestpicture">Βέλτιστη εικόνα</string>
+  <string name="bestpicture_done">ΕΓΙΝΕ</string>
+  <string name="bestpicture_at_least_one_picture">Τουλάχιστον μία εικόνα πρέπει να επιλεγεί.</string>
+  <string name="pref_camera2_shutter_sound_entry_on">Ενεργός</string>
   <string name="pref_camera2_shutter_sound_entry_off">Ανενεργή</string>
+  <string name="pref_camera2_shutter_sound_title">Ήχος κλείστρου</string>
+  <string name="pref_camera2_initial_camera_entry_bayer">Bayer</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Μονόχρωμη</string>
+  <string name="pref_camera2_initial_camera_entry_front">Μπροστινή</string>
 </resources>
diff --git a/res/values-en-rAU/qcomstrings.xml b/res/values-en-rAU/qcomstrings.xml
index 533b97b24..ed864f9c5 100644
--- a/res/values-en-rAU/qcomstrings.xml
+++ b/res/values-en-rAU/qcomstrings.xml
@@ -160,7 +160,6 @@
   <string name="pref_camera_shuttersound_title" translatable="true">Shutter sound</string>
   <string name="pref_camera_shuttersound_entry_enable">Enabled</string>
   <string name="pref_camera_shuttersound_entry_disable">Disabled</string>
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">High-framerate recording is not supported when using Stabilisation/Time lapse/HDR.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -365,11 +364,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">Sensor HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">Multi-frame HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR needs 1x frame</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Video rotation</string>
@@ -428,6 +422,7 @@
   <string name="pref_camera2_camera2_entry_enable">Enable</string>
   <string name="pref_camera2_camera2_entry_disable">Disable</string>
   <string name="pref_camera2_mono_only_title">Mono only</string>
+  <string name="pref_camera2_mono_only_entry_off">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>
@@ -439,6 +434,7 @@
   <string name="pref_camera2_mpo_entry_on">On</string>
   <string name="pref_camera2_mpo_entry_off">Off</string>
   <string name="pref_camera2_makeup_title">Makeup</string>
+  <string name="pref_camera2_makeup_entry_off">Off</string>
   <string name="pref_camera2_noise_reduction_title">Noise reduction</string>
   <string name="pref_camera2_noise_reduction_entry_off">Off</string>
   <string name="pref_camera2_noise_reduction_entry_fast">Fast</string>
@@ -447,10 +443,12 @@
   <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_off">Off</string>
   <string name="pref_camera_scenemode_entry_bestpicture">Best picture</string>
   <string name="bestpicture_done">DONE</string>
   <string name="bestpicture_at_least_one_picture">At least one picture has to be chosen.</string>
   <string name="pref_camera2_shutter_sound_entry_on">On</string>
   <string name="pref_camera2_shutter_sound_entry_off">Off</string>
   <string name="pref_camera2_shutter_sound_title">Shutter sound</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Mono</string>
 </resources>
diff --git a/res/values-en-rCA/cm_strings.xml b/res/values-en-rCA/cm_strings.xml
new file mode 100644
index 000000000..ebca1dc44
--- /dev/null
+++ b/res/values-en-rCA/cm_strings.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2013-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- common aspect ratios -->
+  <!-- aspect ratio greater than 16:9, so "widescreen" or "cinematic" -->
+  <!-- format for entries in the picture size menu. Parameter one is aspect ratio
+         parameter two is size in megapixels, e.g. "(4:3) 12.1 megapixels"
+         NOTE: for Chinese (zh) and Korean (ko) the pixel number (parameter two)
+         will be multiplied by 100 as those languages want to count by ten thousands -->
+  <!-- Settings screen, scene mode -->
+  <!-- Settings screen, focus mode -->
+  <!-- Color effects -->
+  <!-- Red eye flash mode title -->
+  <!-- Power shutter -->
+  <!-- Max brightness -->
+  <!-- Touch focus duration -->
+  <!-- Shutter speed -->
+  <!-- Advanced options -->
+</resources>
diff --git a/res/values-en-rCA/qcomstrings.xml b/res/values-en-rCA/qcomstrings.xml
new file mode 100644
index 000000000..5dc8931ef
--- /dev/null
+++ b/res/values-en-rCA/qcomstrings.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+    Copyright (c) 2012-2014, 2016, The Linux Foundation. All rights reserved.
+
+    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.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<resources>
+  <!-- Video quality setting entry. Videos will be recorded in VGA quality. [CHAR LIMIT=24] -->
+  <!-- Video quality setting entry. Videos will be recorded in CIF quality. [CHAR LIMIT=24] -->
+  <!-- Video quality setting entry. Videos will be recorded in QVGA quality. [CHAR LIMIT=24] -->
+  <!-- Video quality setting entry. Videos will be recorded in QCIF quality. [CHAR LIMIT=24] -->
+  <!-- Settings screen, Power Mode title -->
+  <!-- Settings screen, Power mode dialog radio button choices -->
+  <!-- Settings screen, Power mode dialog radio button choices -->
+  <!-- Default Power mode.. -->
+  <!-- Default auto exposure setting. Do not translate. -->
+  <!-- Settings screen, Select auto exposure title -->
+  <!-- Settings screen, auto exposure dialog radio button choices -->
+  <!-- Auto exposure entry values. Do not translate. -->
+  <!-- Settings screen, Video encoder title -->
+  <!-- Settings screen, Video encoder dialog radio button choices -->
+  <!-- Default video encoder setting. A numerical value. -->
+  <!-- Settings screen, Video encoder dialog title -->
+  <!-- Default audio encoder setting. A numerical value. -->
+  <!-- Settings screen, Audio encoder title -->
+  <!-- Settings screen, Audio encoder dialog radio button choices -->
+  <!-- Default video duration setting. A numerical value.-->
+  <!-- Default Skin Tone Enhancement setting. Do not translate. -->
+  <!-- Settings screen, Select Skin Tone Enhancement title -->
+  <!-- Settings screen, Skin Tone Enhancement radio button choices -->
+  <!-- Skin Tone Enhancement entry values. Do not translate. -->
+  <!-- Settings screen, setting title text for ZSL-->
+  <!-- Default selectable zone af setting. Do not translate. -->
+  <!-- Settings screen, Selectable zone af title -->
+  <!-- Settings screen, Selectable Zone Af dialog radio button choices -->
+  <!-- Auto exposure entry values. Do not translate. -->
+  <!-- Settings screen, Selectable advanced features title -->
+  <!-- Settings screen, Selectable Zone Af dialog radio button choices -->
+  <!-- Auto exposure entry values. Do not translate. -->
+  <!-- Manual exposure control entry values -->
+  <!-- Manual white balance entry values -->
+  <!-- Manual Focus entry values -->
+  <!-- Instant Capture entry -->
+  <!-- Instant Capture entry values -->
+  <!-- Settings screen, ZSL location dialog choices -->
+  <!-- The message is shown in toast when HDR or scene mode is enabled -->
+  <!-- Settings screen, Video HDR location dialog choices -->
+  <!-- Settings screen, CDS location dialog choices -->
+  <!-- Settings screen, video CDS location dialog choices -->
+  <!-- Settings screen, TNR location dialog choices -->
+  <!-- Settings screen, TNR location dialog choices -->
+  <!-- Settings screen, video TNR location dialog choices -->
+  <!-- Settings screen, video TNR location dialog choices -->
+  <!-- Settings screen, setting title text for Video HDR-->
+  <!-- Settings menu, setting title text for cds mode-->
+  <!-- Settings menu, setting title text for video cds mode-->
+  <!-- Default cds mode setting-->
+  <!-- Default video cds mode setting-->
+  <!-- Settings menu, setting title text for tnr mode-->
+  <!-- Settings menu, setting title text for video tnr mode-->
+  <!-- Default tnr mode setting-->
+  <!-- Default video tnr mode setting-->
+  <!-- Default face  detection setting. -->
+  <!-- Settings screen, Select Face Detection -->
+  <!-- Settings menu, Face Detection choices -->
+  <!-- Default Selfie Flash setting. -->
+  <!-- Settings screen, Selfie Flash Detection -->
+  <!-- Settings menu, Selfie Flash choices -->
+  <!-- Default redeye reduction setting. -->
+  <!-- Settings screen, Select Redeye Reduction -->
+  <!-- Settings menu, redeye reduction choices -->
+  <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
+  <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
+  <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
+  <!-- The message is shown in dialog when the app encounters an unsupported resolution for HSR mode -->
+  <!-- The message is shown in dialog when the app encounters an unsupported video codec for HFR mode -->
+  <!-- The message is shown in dialog when the app encounters an unsupported video resolution-->
+  <!-- The message is shown in dialog when the app encounters an unsupported video profile-->
+  <!--The message is shown in dialog when the raw snapshot is selected in zsl mode-->
+  <!-- Settings screen, AE bracketing and HDR location dialog choices -->
+  <!-- The messsage shown if user selects a snapshot resolution lower than the current video size. -->
+  <!-- The messsage shown if user selects a snapshot resolution in low power mode. -->
+  <!-- The messsage shown if user tries to take snapshot during D1/QCIF resolution. -->
+  <!-- Default hfr setting. Do not translate. -->
+  <!-- Settings screen, Select hfr title -->
+  <!-- Settings screen, hfr radio button choices -->
+  <!-- HFR entry values. Do not translate. -->
+  <!-- Default noise reduction setting. Do not translate. -->
+  <!-- Settings screen, Select See More title -->
+  <!-- Settings screen, see more radio button choices -->
+  <!-- see more entry values. Do not translate. -->
+  <!-- Default see more setting. Do not translate. -->
+  <!-- Settings screen, Select See More title -->
+  <!-- Settings screen, see more radio button choices -->
+  <!-- see more entry values. Do not translate. -->
+  <!-- Denoise Settings screen, setting title text -->
+  <!-- Denoise Settings screen, Record location dialog choices -->
+  <!-- Default iso setting. Do not translate. -->
+  <!-- Settings screen, Select Iso title -->
+  <!-- Settings screen, ISO dialog radio button choices -->
+  <!-- ISO entry values. Do not translate. -->
+  <!-- Settings screen, Anti Banding title -->
+  <!-- Default Anti Banding setting. -->
+  <!-- Settings screen, Anti Banding entries -->
+  <!-- Default color effect setting. -->
+  <!-- Settings screen, Select Color effect title -->
+  <!-- Settings screen, Color effect dialog radio button choices -->
+  <!-- Color effect that overexposes and reverses some of the tones. -->
+  <!-- Settings screen, Touch AF/AEC dialog radio button choices -->
+  <!-- Select IS title -->
+  <!-- DIS choices -->
+  <!-- Select Face Recognition title -->
+  <!-- Face Recognition choices -->
+  <!-- Settings screen, Multiple levels entries -->
+  <!-- Settings screen, Multiple levels entries -->
+  <!-- Settings screen, Multiple levels entries -->
+  <!-- Default sharpness setting. Do not translate. -->
+  <!-- Settings screen, Select sharpness title -->
+  <!-- Default contrast setting. Do not translate. -->
+  <!-- Settings screen, Select contrast title -->
+  <!-- Default saturation setting. Do not translate. -->
+  <!-- Settings screen, Select saturation title -->
+  <!-- Default picture quality setting. See pref_camera_jpegquality_entryvalues for possible values -->
+  <!-- Default Picture format setting. Do not translate. -->
+  <!-- Settings screen, Select Picture format title -->
+  <!-- Settings screen, picture format dialog radio button choices -->
+  <!-- Picture format entry values. Do not translate. -->
+  <!-- Settings screen, Picture quality title -->
+  <!-- Settings screen, Picture quality dialog radio button choices -->
+  <!-- Default auto histogram setting. Do not translate. -->
+  <!-- Settings screen, Select Histogram title -->
+  <!-- Settings screen, Histogram radio button choices -->
+  <!-- Histogram entry values. Do not translate. -->
+  <!-- Default auto scene detection setting. -->
+  <!-- Settings screen, Select Auto Scene Detection -->
+  <!-- Settings menu, auto scene detection choices -->
+  <!-- Scene detection set to on - supports backlight and snow cloudy detection. -->
+  <!-- Toast showing error if invalid size selected for  time lapse  [CHAR LIMIT=65] -->
+  <!-- longshot value -->
+  <!-- Toast showing non-supported functionality for flash in AE bracket -->
+  <!-- Settings screen, setting title text for Auto HDR-->
+  <!-- Settings screen, Auto HDR location dialog choices -->
+  <!-- toast message for storage location switch -->
+  <!-- Settings screen, Selectable HDR mode title -->
+  <!-- Settings screen, Selectable HDR mode radio button choices -->
+  <!-- HDR mode entry values. Do not translate. -->
+  <!--Default video rotation setting-->
+  <!--Settings screen, video rotation title-->
+  <!--Menu, video rotation label-->
+  <!-- Settings screen, Video rotation dialog radio button choices -->
+  <!-- The message is shown in toast when click showOnMap Menu and there is no map app -->
+  <!-- Continuous shot enable message -->
+  <!-- Advanced features enable message -->
+  <!-- The alas of CameraActivity for gesture operation -->
+  <!-- Help menu strings -->
+</resources>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
new file mode 100644
index 000000000..e25adc394
--- /dev/null
+++ b/res/values-en-rCA/strings.xml
@@ -0,0 +1,286 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- The name of the Android Camera application. [CHAR LIMIT=16] -->
+  <!-- The label for the Video Camera activity. [CHAR LIMIT=16] -->
+  <!-- Used to format short video duration in Details dialog. minutes:seconds e.g. 00:30 -->
+  <!-- Used to format video duration in Details dialog. hours:minutes:seconds e.g. 0:21:30 -->
+  <!-- Displayed in the title of the dialog for things to do with a picture
+             that is to be "set as" (e.g. set as contact photo or set as wallpaper) -->
+  <!-- Details dialog "OK" button. Dismisses dialog. -->
+  <!-- String Delete the selected media item(s) [CHAR LIMIT=50] -->
+  <!-- The label shown after an image is deleted [CHAR LIMIT=16] -->
+  <!-- The label on the button which when clicked will undo a deletion of image [CHAR LIMIT=16]-->
+  <!-- String indicating how many media item(s) is(are) selected
+            eg. 1 selected [CHAR LIMIT=30] -->
+  <!-- String indicating how many media album(s) is(are) selected
+            eg. 1 selected [CHAR LIMIT=30] -->
+  <!-- String indicating how many media group(s) is(are) selected
+            eg. 1 selected [CHAR LIMIT=30] -->
+  <!-- String indicating timestamp of photo or video -->
+  <!-- String used as a menu label. The user can choose to edit the image
+         [CHAR_LIMIT=20]-->
+  <!-- The title of the menu item to let user crop the image. [CHAR LIMIT=15] -->
+  <!-- The title of the menu item to let user trim the video. [CHAR LIMIT=15] -->
+  <!-- The title of the menu item to let user set the image as background etc. [CHAR LIMIT=15] -->
+  <!-- String indicating an error when playing the video. [CHAR LIMIT=30] -->
+  <!-- Toast message shown when the cropped image has been saved in the
+         %s folder (string: folder_download) [CHAR LIMIT=50]-->
+  <!-- Text indicating the title of a media item in details window [CHAR LIMIT=14] -->
+  <!-- Text indicating the description of a media item in details window [CHAR LIMIT=14] -->
+  <!-- Text indicating the creation time of a media item in details window [CHAR LIMIT=14] -->
+  <!-- Text indicating the location of a media item in details window [CHAR LIMIT=14] -->
+  <!-- Text indicating the path of a media item in details window [CHAR LIMIT=14] -->
+  <!-- Text indicating the width of a media item in details window [CHAR LIMIT=14] -->
+  <!-- Text indicating the height of a media item in details window [CHAR LIMIT=14] -->
+  <!-- Text indicating the orientation of a media item in details window [CHAR LIMIT=14] -->
+  <!-- Text indicating the duration of a video item in details window [CHAR LIMIT=18] -->
+  <!-- Text indicating the mime type of a media item in details window [CHAR LIMIT=14] -->
+  <!-- Text indicating the file size of a media item in details window [CHAR LIMIT=14] -->
+  <!-- Text indicating the maker of a media item in details window [CHAR LIMIT=14] -->
+  <!-- Text indicating the model of a media item in details window [CHAR LIMIT=14] -->
+  <!-- Text indicating flash info of a media item in details window [CHAR LIMIT=14] -->
+  <!-- Text indicating aperture of a media item in details window [CHAR LIMIT=14] -->
+  <!-- Text indicating the focal length of a media item in details window [CHAR LIMIT=14] -->
+  <!-- Text indicating the white balance of a media item in details window [CHAR LIMIT=18] -->
+  <!-- Text indicating the exposure time of a media item in details window [CHAR LIMIT=14] -->
+  <!-- Text indicating the ISO speed rating of a media item in details window [CHAR LIMIT=14] -->
+  <!-- String indicating the time units in seconds. [CHAR LIMIT=8] -->
+  <!-- String indicating the length units in milli-meters. [CHAR LIMIT=8] -->
+  <!-- String indicating how camera shooting feature is used. [CHAR LIMIT=12] -->
+  <!-- String indicating how camera shooting feature is used. [CHAR LIMIT=12 -->
+  <!-- String indicating camera flash is fired. [CHAR LIMIT=14] -->
+  <!-- String indicating camera flash is not used. [CHAR LIMIT=14] -->
+  <!-- String indicating image width or height is unknown. [CHAR LIMIT=14] -->
+  <!-- Toast message shown after we try to make a local album available offline
+         [CHAR LIMIT=150] -->
+  <!-- The content of a dialog showing trimming in progress. [CHAR LIMIT=30] -->
+  <!-- Text to show with progress bar while stitching a photo sphere. 'Photo sphere' is a product name. [CHAR LIMIT=35]-->
+  <!-- title for the dialog showing the error of camera hardware -->
+  <!-- message for the dialog showing the error of camera hardware -->
+  <!-- message for the dialog showing the camera is disabled because of security policies. Camera cannot be used. -->
+  <!-- message for the dialog showing that the app does not have sufficient permissions [CHAR LIMIT=NONE] -->
+  <!-- Dialog "Dismiss" button. Closes the dialog [CHAR LIMIT=12]-->
+  <!-- alert to the user to wait for some operation to complete -->
+  <!-- alert to the user that an SD card must be installed before using the camera -->
+  <!-- alert to the user that the SD card is being disk-checked -->
+  <!-- alert to the user that the camera fails to read or write the SD card. -->
+  <!-- A label that overlays on top of the preview frame to indicate the camcorder is in time lapse mode [CHAR LIMIT=35] -->
+  <!-- Screen display message during image capture to indicate that the capture is in progress, like during HDR+. [CHAR LIMIT=20] -->
+  <!-- Settings screen, camera selection dialog title. Users can select a camera from the phone (front-facing or back-facing). [CHAR LIMIT=20] -->
+  <!-- In select camera setting, back facing camera. [CHAR LIMIT=14] -->
+  <!-- In select camera setting, front-facing camera. [CHAR LIMIT=14] -->
+  <!-- Settings screen, setting title text -->
+  <!--  Label for record location preference [CHAR LIMIT=50] -->
+  <!-- Title for countdown timer on camera settings screen [CHAR LIMIT=30]-->
+  <!-- Entry for countdown timer setting. e.g. 1 second, 10 seconds, etc. [CHAR LIMIT=30]-->
+  <!-- Text followed by a checkbox to turn on/off sound effects during the countdown. [CHAR LIMIT = 24]-->
+  <!-- Entry of camera save path -->
+  <!-- Entry of a on/off setting. The setting is turned off. [CHAR LIMIT=15] -->
+  <!-- Entry of a on/off setting. The setting is turned on. [CHAR LIMIT=15] -->
+  <!-- The value of a camera preference indicating the setting is off. -->
+  <!-- The value of a camera preference indicating the setting is on. -->
+  <!-- The Video quality settings in preference [CHAR LIMIT=21] -->
+  <!-- The default quality value is NULL -->
+  <!-- Video quality setting entry.
+    Videos will be recorded in 4k DCI quality. [CHAR LIMIT=24] -->
+  <!-- Video quality setting entry.
+    Videos will be recorded in 4k UHD quality. [CHAR LIMIT=24] -->
+  <!-- Video quality setting entry. Videos will be recorded in 1080p quality. [CHAR LIMIT=24] -->
+  <!-- Video quality setting entry. Videos will be recorded in 720p quality. [CHAR LIMIT=24] -->
+  <!-- Video quality setting entry. Videos will be recorded in 480p quality. [CHAR LIMIT=24] -->
+  <!-- Video quality setting entry. Videos will be recorded in QHD quality. [CHAR LIMIT=24] -->
+  <!-- Video quality setting entry. Videos will be recorded in 2K quality. [CHAR LIMIT=24] -->
+  <!-- Describes the preference dialog for choosing interval between frame capture for
+    time lapse recording. Appears at top of the dialog. [CHAR LIMIT=30] -->
+  <!-- Settings screen, Camera setting category title -->
+  <!-- Settings screen, Camcorder setting category title -->
+  <!-- Settings screen, Picture size title -->
+  <!-- Settings screen, Focus mode title -->
+  <!-- Settings screen, Focus mode dialog radio button choices -->
+  <!-- A setting that lets the camera focus into infinity. [CHAR LIMIT=20] -->
+  <!-- A setting that lets the camera operate in macro focus mode for nearby objects. [CHAR LIMIT=20] -->
+  <!-- Menu, focus mode labels [CHAR LIMIT=50] -->
+  <!-- Default flash mode setting.-->
+  <!-- Value for flash off setting-->
+  <!-- Settings screen, Flash mode title -->
+  <!-- Settings screen, Flash mode 'auto'. [CHAR LIMIT=12] -->
+  <!-- Settings screen, Flash mode 'alway on'. [CHAR LIMIT=12] -->
+  <!-- Settings screen, Flash mode 'always off'. [CHAR LIMIT=12] -->
+  <!-- Menu, flash mode labels [CHAR LIMIT=50] -->
+  <!-- Default videocamera flash mode setting.-->
+  <!-- Default white balance setting. -->
+  <!-- Settings screen, white balance title -->
+  <!-- Menu, white balance label -->
+  <!-- Settings screen, White balance dialog radio button choices -->
+  <!-- Menu, White balance labels [CHAR LIMIT=50] -->
+  <!-- Default scene mode setting. -->
+  <!-- Settings screen, Select Scene mode -->
+  <!-- Settings menu, scene mode choices [CHAR LIMIT=16] -->
+  <!-- Scene mode that uses HDR plus (better HDR) [CHAR LIMIT=16] -->
+  <!-- Scene mode that uses HDR (high dynamic range) [CHAR LIMIT=16] -->
+  <!-- Scene mode to turn on HDR (better high dynamic range) [CHAR LIMIT=50] -->
+  <!-- Scene mode to turn off HDR (better high dynamic range) [CHAR LIMIT=50] -->
+  <!-- Scene mode to turn on HDR (high dynamic range) [CHAR LIMIT=50] -->
+  <!-- Scene mode to turn off HDR (high dynamic range) [CHAR LIMIT=50] -->
+  <!-- Scene mode that takes an image quickly with little motion blur. [CHAR LIMIT=16] -->
+  <!-- Scene mode that takes long exposures to capture night scenes without flash. [CHAR LIMIT=16] -->
+  <!-- Scene mode optimized for taking images in the sunset. [CHAR LIMIT=16] -->
+  <!-- Scene mode optimized for taking indoor low-lights pictures. [CHAR LIMIT=16] -->
+  <!-- Scene mode for refocus feature [CHAR LIMIT=16] -->
+  <!-- Settings menu, scene mode labels [CHAR LIMIT=50] -->
+  <!-- Scene mode that takes an image quickly with little motion blur. [CHAR LIMIT=50] -->
+  <!-- Scene mode that takes long exposures to capture night scenes without flash. [CHAR LIMIT=50] -->
+  <!-- Scene mode optimized for taking images in the sunset. [CHAR LIMIT=50] -->
+  <!-- Scene mode optimized for taking indoor low-lights pictures. [CHAR LIMIT=50] -->
+  <!-- Settings menu countdown timer off [CHAR LIMIT=50] -->
+  <!-- Settings menu countdown timer 1 second [CHAR LIMIT=50] -->
+  <!-- Settings menu countdown timer 3 seconds [CHAR LIMIT=50] -->
+  <!-- Settings menu countdown timer 10 seconds [CHAR LIMIT=50] -->
+  <!-- Settings menu countdown timer 15 seconds [CHAR LIMIT=50] -->
+  <!-- Toast after trying to select a setting that is not allowed to change in scene mode [CHAR LIMIT=NONE] -->
+  <!-- Toast after enable HDR function to inform Continuous Shot has disabled -->
+  <!-- Toast after enable Advanced Capture function to inform Continuous Shot has disabled -->
+  <!-- Toast after enable 2k4k video quality to inform IS has disabled -->
+  <!-- Toast after 2k4k video is enabled to inform SeeMore has been disabled -->
+  <!-- Toast after High Quality Noise Reduction has been enabled to show CDS is disabled -->
+  <!-- Toast after High Quality Noise Reduction has been enabled to show TNR is disabled -->
+  <!-- Toast after SeeMore has been enabled to show CDS is disabled -->
+  <!-- Toast after SeeMore has been enabled to show TNR is disabled -->
+  <!-- Toast after SeeMore has been enabled to show NR is disabled -->
+  <!-- Exposure settings in preference -->
+  <!--  menu label exposure compensation [CHAR LIMIT=50] -->
+  <!-- Default HDR entry value -->
+  <!-- Default HDR+ entry value -->
+  <!-- HDR label ON [CHAR LIMIT=60] -->
+  <!-- switch camera label back [CHAR LIMIT=60] -->
+  <!-- switch camera label front [CHAR LIMIT=60] -->
+  <!-- Dialog "OK" button. Dismisses dialog. -->
+  <!-- Low-memory dialog message [CHAR LIMIT=NONE] -->
+  <!-- Camera format string for new image files. Passed to java.text.SimpleDateFormat. -->
+  <!-- Video Camera format string for new video files. Passed to java.text.SimpleDateFormat. -->
+  <!-- Filename prefix for panorama output. -->
+  <!-- The message shown when video record reaches size limit. -->
+  <!-- The text shown when the panorama panning speed is to fast [CHAR LIMIT=16] -->
+  <!-- The text shown in the progress dialog when panorama preview is generating in the background [CHAR LIMIT=30] -->
+  <!-- The text shown in the dialog when panorama saving failed [CHAR LIMIT=40] -->
+  <!-- The text shown on the dialog title in the dialogs for Panorama [CHAR LIMIT=12] -->
+  <!-- The text shown on the top-left corner of the screen to indicate the capturing is on going [CHAR LIMIT=27] -->
+  <!-- The text shown in the progress dialog when waiting for previous panorama finishing [CHAR LIMIT=40] -->
+  <!-- The text shown on the bottom-left corner of the screen to indicate that the saving is in process [CHAR LIMIT=13] -->
+  <!-- The text shown on the screen to indicate that the panorama is rendering [CHAR LIMIT=27] -->
+  <!-- Toast telling users tapping on the viewfinder will trigger autofocus [CHAR LIMIT=28] -->
+  <!-- Default effect setting that clears the effect. -->
+  <!-- Title of video effect setting popup window -->
+  <!-- Effect setting item that clear the effect. [CHAR LIMIT=14] -->
+  <!-- Effect setting item that squeezes the face. [CHAR LIMIT=14] -->
+  <!-- Effect setting item that makes eyes big. [CHAR LIMIT=14] -->
+  <!-- Effect setting item that makes mouth big. [CHAR LIMIT=14] -->
+  <!-- Effect setting item that makes mouth small. [CHAR LIMIT=14] -->
+  <!-- Effect setting item that makes nose big. [CHAR LIMIT=14] -->
+  <!-- Effect setting item that makes eyes small. [CHAR LIMIT=14] -->
+  <!-- Effect setting item that replaces background with Android in Space. [CHAR LIMIT=14] -->
+  <!-- Effect setting item that replaces background with a sunset. [CHAR LIMIT=14] -->
+  <!-- Effect setting item that replaces background with video from gallery. [CHAR LIMIT=14] -->
+  <!-- Toast telling users tapping on the viewfinder will take a picture [CHAR LIMIT=54] -->
+  <!-- Announcement telling users video recording has just started [CHAR LIMIT=NONE] -->
+  <!-- Announcement telling users video recording has just stopped [CHAR LIMIT=NONE] -->
+  <!-- A button in effect setting popup to clear the effect. [CHAR LIMIT=26] -->
+  <!-- Title of category for silly face effects. [CHAR LIMIT=26] -->
+  <!-- Title of category for background replacement effects. [CHAR LIMIT=26] -->
+  <!-- The shutter button. [CHAR LIMIT = NONE] -->
+  <!-- The menu button. [CHAR LIMIT = NONE] -->
+  <!-- The mode picker to switch between camera, video and panorama. [CHAR LIMIT = NONE] -->
+  <!-- The check box in camera settings, such as store location. [CHAR LIMIT = NONE] -->
+  <!-- The button to switch to Camera mode. [CHAR LIMIT = NONE] -->
+  <!-- The button to switch to Video mode. [CHAR LIMIT = NONE] -->
+  <!-- The button to switch to Panorama mode. [CHAR LIMIT = NONE] -->
+  <!-- The button to switch to the Photo Sphere mode. [CHAR LIMIT = NONE] -->
+  <!-- The button to switch to the high quality mode. [CHAR LIMIT = NONE] -->
+  <!-- The button in review mode indicating that the photo taking, video recording, and panorama saving session should be canceled [CHAR LIMIT = NONE] -->
+  <!-- The button in review mode indicating that the taken photo/video is OK to be attached/uploaded [CHAR LIMIT = NONE] -->
+  <!-- button in review mode indicate the user want to retake another photo/video for attachment [
+CHAR LIMIT = NONE] -->
+  <!-- Default text for a button that can be toggled on and off. -->
+  <!-- Default text for a button that can be toggled on and off. -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Seconds: a unit of time for time lapse intervals. [CHAR LIMIT = 20] -->
+  <!-- Minutes: a unit of time for time lapse intervals. [CHAR LIMIT = 20] -->
+  <!-- Hours: a unit of time for time lapse intervals. [CHAR LIMIT = 20] -->
+  <!-- The button to confirm time-lapse setting changes. [CHAR LIMIT = 20] -->
+  <!-- Title in time interval picker for setting time interval. [CHAR LIMIT = 30]-->
+  <!-- Help text that is shown when the time lapse feature is turned off. [CHAR LIMIT = 180]-->
+  <!-- Title in timer setting for setting the duration for the countdown timer. [CHAR LIMIT = 50]-->
+  <!-- On-screen hint during timer countdown for taking a photo. [CHAR LIMIT = 60]-->
+  <!-- Title for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 50] -->
+  <!-- Message for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = None] -->
+  <!-- Negative answer for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 20] -->
+  <!-- Positive answer for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 20] -->
+  <!-- Camera menu labels -->
+  <!-- more options label [CHAR LIMIT=50] -->
+  <!-- settings label [CHAR LIMIT=50] -->
+  <!--  Tiny Planet -->
+  <!-- Button to press for creating a tiny planet image. [CHAR LIMIT = 30] -->
+  <!-- Message shown while a tiny planet image is being saved. [CHAR LIMIT = 30] -->
+  <!-- Label above a slider that let's the user set the zoom of a tiny planet image. [CHAR LIMIT = 15] -->
+  <!-- Label above a slider that let's the user set the rotation of a tiny planet image. [CHAR LIMIT = 15] -->
+  <!-- Crop -->
+  <!-- Label for the save button in the crop activity action bar [CHAR LIMIT=20] -->
+  <!--  String shown when we cannot load the image when starting the activity [CHAR LIMIT=NONE] -->
+  <!-- Label for album filmstrip button -->
+  <!--  String shown when setting the homepage wallpaper in the background [CHAR LIMIT=NONE] -->
+  <!-- Menu, Video rotation labels [CHAR LIMIT=50] -->
+</resources>
diff --git a/res/values-en-rGB/qcomstrings.xml b/res/values-en-rGB/qcomstrings.xml
index cbb368bfc..6aaa042a7 100644
--- a/res/values-en-rGB/qcomstrings.xml
+++ b/res/values-en-rGB/qcomstrings.xml
@@ -160,7 +160,6 @@
   <string name="pref_camera_shuttersound_title" translatable="true">Shutter sound</string>
   <string name="pref_camera_shuttersound_entry_enable">Enabled</string>
   <string name="pref_camera_shuttersound_entry_disable">Disabled</string>
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">High-frame rate recording is not supported when using Stabilisation/Time lapse/HDR.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -364,11 +363,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">Sensor HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">Multi-frame HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR needs 1x frame</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Video rotation</string>
@@ -427,6 +421,7 @@
   <string name="pref_camera2_camera2_entry_enable">Enable</string>
   <string name="pref_camera2_camera2_entry_disable">Disable</string>
   <string name="pref_camera2_mono_only_title">Mono only</string>
+  <string name="pref_camera2_mono_only_entry_off">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>
@@ -438,6 +433,7 @@
   <string name="pref_camera2_mpo_entry_on">On</string>
   <string name="pref_camera2_mpo_entry_off">Off</string>
   <string name="pref_camera2_makeup_title">Makeup</string>
+  <string name="pref_camera2_makeup_entry_off">Off</string>
   <string name="pref_camera2_noise_reduction_title">Noise reduction</string>
   <string name="pref_camera2_noise_reduction_entry_off">Off</string>
   <string name="pref_camera2_noise_reduction_entry_fast">Fast</string>
@@ -446,10 +442,12 @@
   <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_off">Off</string>
   <string name="pref_camera_scenemode_entry_bestpicture">Best picture</string>
   <string name="bestpicture_done">DONE</string>
   <string name="bestpicture_at_least_one_picture">At least one picture has to be chosen.</string>
   <string name="pref_camera2_shutter_sound_entry_on">On</string>
   <string name="pref_camera2_shutter_sound_entry_off">Off</string>
   <string name="pref_camera2_shutter_sound_title">Shutter sound</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Mono</string>
 </resources>
diff --git a/res/values-en-rIN/qcomstrings.xml b/res/values-en-rIN/qcomstrings.xml
index b36eeeaab..835c98499 100644
--- a/res/values-en-rIN/qcomstrings.xml
+++ b/res/values-en-rIN/qcomstrings.xml
@@ -161,7 +161,6 @@
   <string name="pref_camera_shuttersound_title" translatable="true">Shutter sound</string>
   <string name="pref_camera_shuttersound_entry_enable">Enabled</string>
   <string name="pref_camera_shuttersound_entry_disable">Disabled</string>
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">High-framerate recording is not supported when using Stabilisation/Time lapse/HDR.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -365,11 +364,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">Sensor HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">Multi-frame HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR needs 1x frame</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Video rotation</string>
@@ -428,6 +422,7 @@
   <string name="pref_camera2_camera2_entry_enable">Enable</string>
   <string name="pref_camera2_camera2_entry_disable">Disable</string>
   <string name="pref_camera2_mono_only_title">Mono only</string>
+  <string name="pref_camera2_mono_only_entry_off">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>
@@ -439,6 +434,7 @@
   <string name="pref_camera2_mpo_entry_on">On</string>
   <string name="pref_camera2_mpo_entry_off">Off</string>
   <string name="pref_camera2_makeup_title">Makeup</string>
+  <string name="pref_camera2_makeup_entry_off">Off</string>
   <string name="pref_camera2_noise_reduction_title">Noise reduction</string>
   <string name="pref_camera2_noise_reduction_entry_off">Off</string>
   <string name="pref_camera2_noise_reduction_entry_fast">Fast</string>
@@ -447,10 +443,12 @@
   <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_off">Off</string>
   <string name="pref_camera_scenemode_entry_bestpicture">Best picture</string>
   <string name="bestpicture_done">DONE</string>
   <string name="bestpicture_at_least_one_picture">At least one picture has to be chosen.</string>
   <string name="pref_camera2_shutter_sound_entry_on">On</string>
   <string name="pref_camera2_shutter_sound_entry_off">Off</string>
   <string name="pref_camera2_shutter_sound_title">Shutter sound</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Mono</string>
 </resources>
diff --git a/res/values-en-rPT/qcomstrings.xml b/res/values-en-rPT/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-en-rPT/qcomstrings.xml
+++ b/res/values-en-rPT/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-eo/qcomstrings.xml b/res/values-eo/qcomstrings.xml
index 96a25fd99..91def0c09 100644
--- a/res/values-eo/qcomstrings.xml
+++ b/res/values-eo/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -162,10 +161,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-es-rCO/qcomstrings.xml b/res/values-es-rCO/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-es-rCO/qcomstrings.xml
+++ b/res/values-es-rCO/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-es-rMX/qcomstrings.xml b/res/values-es-rMX/qcomstrings.xml
index 983813792..c19481be3 100644
--- a/res/values-es-rMX/qcomstrings.xml
+++ b/res/values-es-rMX/qcomstrings.xml
@@ -131,7 +131,6 @@
   <!-- Settings screen, Select Redeye Reduction -->
   <string name="pref_camera_redeyereduction_title">Reducción ojos rojos</string>
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">La grabación de alta velocidad de fotogramas no es compatible cuando se usa la estabilización/TimeLapse/HDR.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -310,11 +309,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">Sensor HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">Multi-frame HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR necesita un marco de 1x</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Rotación de video</string>
@@ -336,9 +330,13 @@
   <string name="all_in_focus">Todo en foco</string>
   <string name="refocus_toast">Para volver a enfocar la última foto, pulsa aquí</string>
   <!-- Help menu strings -->
+  <string name="pref_camera2_mono_only_entry_off">Desactivada</string>
   <string name="pref_camera2_mono_preview_entry_off">Desactivada</string>
   <string name="pref_camera2_clearsight_entry_off">Desactivada</string>
   <string name="pref_camera2_mpo_entry_off">Desactivada</string>
+  <string name="pref_camera2_makeup_entry_off">Desactivada</string>
   <string name="pref_camera2_noise_reduction_entry_off">Desactivada</string>
+  <string name="pref_camera2_trackingfocus_entry_off">Desactivada</string>
   <string name="pref_camera2_shutter_sound_entry_off">Desactivada</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Mono</string>
 </resources>
diff --git a/res/values-es-rUS/qcomstrings.xml b/res/values-es-rUS/qcomstrings.xml
index 5d1d54d9e..16b02f8bc 100644
--- a/res/values-es-rUS/qcomstrings.xml
+++ b/res/values-es-rUS/qcomstrings.xml
@@ -160,7 +160,6 @@
   <string name="pref_camera_shuttersound_title" translatable="true">Sonido del obturador</string>
   <string name="pref_camera_shuttersound_entry_enable">Activado</string>
   <string name="pref_camera_shuttersound_entry_disable">Desactivado</string>
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">Alta velocidad/cámara lenta no es compatible con DIS y TimeLapse.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -364,11 +363,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">Sensor HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">Multi-frame HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR necesita un marco de 1x</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Rotación de video</string>
@@ -427,6 +421,7 @@
   <string name="pref_camera2_camera2_entry_enable">Activar</string>
   <string name="pref_camera2_camera2_entry_disable">Desactivar</string>
   <string name="pref_camera2_mono_only_title">Sólo monocromo</string>
+  <string name="pref_camera2_mono_only_entry_off">Desactivada</string>
   <string name="pref_camera2_mono_preview_title">Vista previa monocromática</string>
   <string name="pref_camera2_mono_preview_entry_on">Activado</string>
   <string name="pref_camera2_mono_preview_entry_off">Desactivada</string>
@@ -438,6 +433,7 @@
   <string name="pref_camera2_mpo_entry_on">Activado</string>
   <string name="pref_camera2_mpo_entry_off">Desactivada</string>
   <string name="pref_camera2_makeup_title">Maquillaje</string>
+  <string name="pref_camera2_makeup_entry_off">Desactivada</string>
   <string name="pref_camera2_noise_reduction_title">Reducción de ruido</string>
   <string name="pref_camera2_noise_reduction_entry_off">Desactivada</string>
   <string name="pref_camera2_noise_reduction_entry_fast">Rápida</string>
@@ -446,10 +442,12 @@
   <string name="pref_camera2_videosnap_entry_enable">Activar</string>
   <string name="pref_camera2_videosnap_entry_disable">Desactivar</string>
   <string name="pref_camera2_trackingfocus_title">Seguimiento del enfoque</string>
+  <string name="pref_camera2_trackingfocus_entry_off">Desactivada</string>
   <string name="pref_camera_scenemode_entry_bestpicture">Mejor imagen</string>
   <string name="bestpicture_done">HECHO</string>
   <string name="bestpicture_at_least_one_picture">Se debe marcar al menos una imagen.</string>
   <string name="pref_camera2_shutter_sound_entry_on">Activado</string>
   <string name="pref_camera2_shutter_sound_entry_off">Desactivada</string>
   <string name="pref_camera2_shutter_sound_title">Sonido del obturador</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Mono</string>
 </resources>
diff --git a/res/values-es/qcomstrings.xml b/res/values-es/qcomstrings.xml
index 4b25da2d3..8b3b4d959 100644
--- a/res/values-es/qcomstrings.xml
+++ b/res/values-es/qcomstrings.xml
@@ -160,7 +160,6 @@
   <string name="pref_camera_shuttersound_title" translatable="true">Sonido del obturador</string>
   <string name="pref_camera_shuttersound_entry_enable">Activado</string>
   <string name="pref_camera_shuttersound_entry_disable">Desactivado</string>
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">La grabación de alta velocidad de fotogramas no es compatible cuando se usa la estabilización/TimeLapse/HDR.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -364,11 +363,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">Sensor HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">HDR de marcos múltiples</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR necesita marco de 1x</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Rotación de vídeo</string>
@@ -427,6 +421,7 @@
   <string name="pref_camera2_camera2_entry_enable">Activar</string>
   <string name="pref_camera2_camera2_entry_disable">Desactivar</string>
   <string name="pref_camera2_mono_only_title">Sólo monocromo</string>
+  <string name="pref_camera2_mono_only_entry_off">Apagar</string>
   <string name="pref_camera2_mono_preview_title">Previsualización Mono</string>
   <string name="pref_camera2_mono_preview_entry_on">Activado</string>
   <string name="pref_camera2_mono_preview_entry_off">Apagar</string>
@@ -438,6 +433,7 @@
   <string name="pref_camera2_mpo_entry_on">Activado</string>
   <string name="pref_camera2_mpo_entry_off">Apagar</string>
   <string name="pref_camera2_makeup_title">Maquillaje</string>
+  <string name="pref_camera2_makeup_entry_off">Apagar</string>
   <string name="pref_camera2_noise_reduction_title">Reducción de ruido</string>
   <string name="pref_camera2_noise_reduction_entry_off">Apagar</string>
   <string name="pref_camera2_noise_reduction_entry_fast">Rápida</string>
@@ -446,10 +442,12 @@
   <string name="pref_camera2_videosnap_entry_enable">Activar</string>
   <string name="pref_camera2_videosnap_entry_disable">Desactivar</string>
   <string name="pref_camera2_trackingfocus_title">Seguimiento del enfoque</string>
+  <string name="pref_camera2_trackingfocus_entry_off">Apagar</string>
   <string name="pref_camera_scenemode_entry_bestpicture">Mejor imagen</string>
   <string name="bestpicture_done">HECHO</string>
   <string name="bestpicture_at_least_one_picture">Al menos una imagen tiene que ser seleccionada.</string>
   <string name="pref_camera2_shutter_sound_entry_on">Activado</string>
   <string name="pref_camera2_shutter_sound_entry_off">Apagar</string>
   <string name="pref_camera2_shutter_sound_title">Sonido del obturador</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Mono</string>
 </resources>
diff --git a/res/values-et-rEE/qcomstrings.xml b/res/values-et-rEE/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-et-rEE/qcomstrings.xml
+++ b/res/values-et-rEE/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-eu-rES/qcomstrings.xml b/res/values-eu-rES/qcomstrings.xml
index c9fbdaf43..be4100351 100644
--- a/res/values-eu-rES/qcomstrings.xml
+++ b/res/values-eu-rES/qcomstrings.xml
@@ -160,7 +160,6 @@
   <string name="pref_camera_shuttersound_title" translatable="true">Obturadorearen soinua</string>
   <string name="pref_camera_shuttersound_entry_enable">Gaituta</string>
   <string name="pref_camera_shuttersound_entry_disable">Desgaituta</string>
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">Abiadura handia/Kamera geldoa ez dago jasanda Irudi egonkortze digitala eta TimeLapse moduetan</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -364,11 +363,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">Sentsore HDRa</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">Hainbat fotogramako HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDRk 1x fotograma behar du</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Bideo biraketa</string>
@@ -427,6 +421,7 @@
   <string name="pref_camera2_camera2_entry_enable">Gaitu</string>
   <string name="pref_camera2_camera2_entry_disable">Desgaitu</string>
   <string name="pref_camera2_mono_only_title">Mono besterik ez</string>
+  <string name="pref_camera2_mono_only_entry_off">Ez</string>
   <string name="pref_camera2_mono_preview_title">Mono aurrebista</string>
   <string name="pref_camera2_mono_preview_entry_on">Bai</string>
   <string name="pref_camera2_mono_preview_entry_off">Ez</string>
@@ -438,6 +433,7 @@
   <string name="pref_camera2_mpo_entry_on">Bai</string>
   <string name="pref_camera2_mpo_entry_off">Ez</string>
   <string name="pref_camera2_makeup_title">Makillajea</string>
+  <string name="pref_camera2_makeup_entry_off">Ez</string>
   <string name="pref_camera2_noise_reduction_title">Zarata murrizketa</string>
   <string name="pref_camera2_noise_reduction_entry_off">Ez</string>
   <string name="pref_camera2_noise_reduction_entry_fast">Azkarra</string>
@@ -446,10 +442,12 @@
   <string name="pref_camera2_videosnap_entry_enable">Gaitu</string>
   <string name="pref_camera2_videosnap_entry_disable">Desgaitu</string>
   <string name="pref_camera2_trackingfocus_title">Fokua jarraitzen</string>
+  <string name="pref_camera2_trackingfocus_entry_off">Ez</string>
   <string name="pref_camera_scenemode_entry_bestpicture">Argazkirik onena</string>
   <string name="bestpicture_done">EGINDA</string>
   <string name="bestpicture_at_least_one_picture">Gutxienez argazki bat aukeratu behar da.</string>
   <string name="pref_camera2_shutter_sound_entry_on">Bai</string>
   <string name="pref_camera2_shutter_sound_entry_off">Ez</string>
   <string name="pref_camera2_shutter_sound_title">Obturadorearen soinua</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Mono</string>
 </resources>
diff --git a/res/values-fa/qcomstrings.xml b/res/values-fa/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-fa/qcomstrings.xml
+++ b/res/values-fa/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-fi/qcomstrings.xml b/res/values-fi/qcomstrings.xml
index f4fda5b30..3ccd849e1 100644
--- a/res/values-fi/qcomstrings.xml
+++ b/res/values-fi/qcomstrings.xml
@@ -160,7 +160,6 @@
   <string name="pref_camera_shuttersound_title" translatable="true">Sulkijan nopeus</string>
   <string name="pref_camera_shuttersound_entry_enable">Ota käyttöön</string>
   <string name="pref_camera_shuttersound_entry_disable">Poistettu käytöstä</string>
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">Suurnopeus-/Hidastuskuvaus ei ole tuettu käytettäessä DIS:iä tai TimeLapsea</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -364,11 +363,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">Sensori-HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">Multi-frame HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR tarvitsee 1x kehyksen</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Videon asento</string>
@@ -427,6 +421,7 @@
   <string name="pref_camera2_camera2_entry_enable">Ota käyttöön</string>
   <string name="pref_camera2_camera2_entry_disable">Poista käytöstä</string>
   <string name="pref_camera2_mono_only_title">Vain mustavalkoinen</string>
+  <string name="pref_camera2_mono_only_entry_off">Pois käyt.</string>
   <string name="pref_camera2_mono_preview_title">Mustavalkoinen esikatselu</string>
   <string name="pref_camera2_mono_preview_entry_on">Käytössä</string>
   <string name="pref_camera2_mono_preview_entry_off">Pois käyt.</string>
@@ -438,6 +433,7 @@
   <string name="pref_camera2_mpo_entry_on">Käytössä</string>
   <string name="pref_camera2_mpo_entry_off">Pois käyt.</string>
   <string name="pref_camera2_makeup_title">Meikki</string>
+  <string name="pref_camera2_makeup_entry_off">Pois käyt.</string>
   <string name="pref_camera2_noise_reduction_title">Kohinanvaimennus</string>
   <string name="pref_camera2_noise_reduction_entry_off">Pois käyt.</string>
   <string name="pref_camera2_noise_reduction_entry_fast">Nopea</string>
@@ -446,10 +442,12 @@
   <string name="pref_camera2_videosnap_entry_enable">Ota käyttöön</string>
   <string name="pref_camera2_videosnap_entry_disable">Poista käytöstä</string>
   <string name="pref_camera2_trackingfocus_title">Tarkennuksen seuranta</string>
+  <string name="pref_camera2_trackingfocus_entry_off">Pois käyt.</string>
   <string name="pref_camera_scenemode_entry_bestpicture">Paras kuva</string>
   <string name="bestpicture_done">VALMIS</string>
   <string name="bestpicture_at_least_one_picture">Sinun tulee valita ainakin yksi kuva.</string>
   <string name="pref_camera2_shutter_sound_entry_on">Käytössä</string>
   <string name="pref_camera2_shutter_sound_entry_off">Pois käyt.</string>
   <string name="pref_camera2_shutter_sound_title">Sulkijan ääni</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Mono</string>
 </resources>
diff --git a/res/values-fil-rPH/qcomstrings.xml b/res/values-fil-rPH/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-fil-rPH/qcomstrings.xml
+++ b/res/values-fil-rPH/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-fr-rCA/qcomstrings.xml b/res/values-fr-rCA/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-fr-rCA/qcomstrings.xml
+++ b/res/values-fr-rCA/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-fr/qcomstrings.xml b/res/values-fr/qcomstrings.xml
index b404d548a..a59a9afe1 100644
--- a/res/values-fr/qcomstrings.xml
+++ b/res/values-fr/qcomstrings.xml
@@ -160,7 +160,6 @@
   <string name="pref_camera_shuttersound_title" translatable="true">Son de l\'obturateur</string>
   <string name="pref_camera_shuttersound_entry_enable">Activé</string>
   <string name="pref_camera_shuttersound_entry_disable">Désactivé</string>
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">Haute vitesse/ralenti non pris en charge lors de l\'utilisation de la stabilisation, du ralenti et du HDR.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -364,11 +363,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">Capteur HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">Multi-couche HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR requiert 1x couche</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Rotation vidéo</string>
@@ -427,6 +421,7 @@
   <string name="pref_camera2_camera2_entry_enable">Activer</string>
   <string name="pref_camera2_camera2_entry_disable">Désactiver</string>
   <string name="pref_camera2_mono_only_title">Mono uniquement</string>
+  <string name="pref_camera2_mono_only_entry_off">Désactivé</string>
   <string name="pref_camera2_mono_preview_title">Aperçu mono</string>
   <string name="pref_camera2_mono_preview_entry_on">Activé</string>
   <string name="pref_camera2_mono_preview_entry_off">Désactivé</string>
@@ -438,6 +433,7 @@
   <string name="pref_camera2_mpo_entry_on">Activé</string>
   <string name="pref_camera2_mpo_entry_off">Désactivé</string>
   <string name="pref_camera2_makeup_title">Maquillage</string>
+  <string name="pref_camera2_makeup_entry_off">Désactivé</string>
   <string name="pref_camera2_noise_reduction_title">Réduction du bruit</string>
   <string name="pref_camera2_noise_reduction_entry_off">Désactivé</string>
   <string name="pref_camera2_noise_reduction_entry_fast">Rapide</string>
@@ -446,10 +442,12 @@
   <string name="pref_camera2_videosnap_entry_enable">Activer</string>
   <string name="pref_camera2_videosnap_entry_disable">Désactiver</string>
   <string name="pref_camera2_trackingfocus_title">Mise au point automatique par suivi du sujet</string>
+  <string name="pref_camera2_trackingfocus_entry_off">Désactivé</string>
   <string name="pref_camera_scenemode_entry_bestpicture">Image optimale</string>
   <string name="bestpicture_done">TERMINÉ</string>
   <string name="bestpicture_at_least_one_picture">Vous devez choisir au moins une photo.</string>
   <string name="pref_camera2_shutter_sound_entry_on">Activé</string>
   <string name="pref_camera2_shutter_sound_entry_off">Désactivé</string>
   <string name="pref_camera2_shutter_sound_title">Son de l\'obturateur</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Mono</string>
 </resources>
diff --git a/res/values-frp-rIT/qcomstrings.xml b/res/values-frp-rIT/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-frp-rIT/qcomstrings.xml
+++ b/res/values-frp-rIT/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-fy-rNL/qcomstrings.xml b/res/values-fy-rNL/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-fy-rNL/qcomstrings.xml
+++ b/res/values-fy-rNL/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-ga-rIE/qcomstrings.xml b/res/values-ga-rIE/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-ga-rIE/qcomstrings.xml
+++ b/res/values-ga-rIE/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-gd-rGB/qcomstrings.xml b/res/values-gd-rGB/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-gd-rGB/qcomstrings.xml
+++ b/res/values-gd-rGB/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-gl-rES/qcomstrings.xml b/res/values-gl-rES/qcomstrings.xml
index 01eaa7e0e..2c15c714a 100644
--- a/res/values-gl-rES/qcomstrings.xml
+++ b/res/values-gl-rES/qcomstrings.xml
@@ -160,8 +160,6 @@
   <string name="pref_camera_shuttersound_title" translatable="true">So do obturador</string>
   <string name="pref_camera_shuttersound_entry_enable">Activado</string>
   <string name="pref_camera_shuttersound_entry_disable">Desactivado</string>
-  <!-- Default mce setting. Do not translate. -->
-  <string name="pref_camera_mce_default">activar</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">Os modos Gran velocidade/Cámara lenta non son compatíbeis con DIS e TimeLapse</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -365,11 +363,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">Sensor HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">Multicadro HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">O HDR necesita 1x cadro</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Rotación de vídeo</string>
@@ -428,6 +421,7 @@
   <string name="pref_camera2_camera2_entry_enable">Activado</string>
   <string name="pref_camera2_camera2_entry_disable">Desactivado</string>
   <string name="pref_camera2_mono_only_title">Solo mono</string>
+  <string name="pref_camera2_mono_only_entry_off">Apagado</string>
   <string name="pref_camera2_mono_preview_title">Mono Preview</string>
   <string name="pref_camera2_mono_preview_entry_on">Encendido</string>
   <string name="pref_camera2_mono_preview_entry_off">Apagado</string>
@@ -439,6 +433,7 @@
   <string name="pref_camera2_mpo_entry_on">Encendido</string>
   <string name="pref_camera2_mpo_entry_off">Apagado</string>
   <string name="pref_camera2_makeup_title">Maquillage</string>
+  <string name="pref_camera2_makeup_entry_off">Apagado</string>
   <string name="pref_camera2_noise_reduction_title">Redución do ruído</string>
   <string name="pref_camera2_noise_reduction_entry_off">Apagado</string>
   <string name="pref_camera2_noise_reduction_entry_fast">Rápido</string>
@@ -447,10 +442,12 @@
   <string name="pref_camera2_videosnap_entry_enable">Activado</string>
   <string name="pref_camera2_videosnap_entry_disable">Desactivado</string>
   <string name="pref_camera2_trackingfocus_title">Enfoque do seguimiento</string>
+  <string name="pref_camera2_trackingfocus_entry_off">Apagado</string>
   <string name="pref_camera_scenemode_entry_bestpicture">Mellor foto</string>
   <string name="bestpicture_done">FEITO</string>
   <string name="bestpicture_at_least_one_picture">Tes que elegirse ao menos unha imaxen.</string>
   <string name="pref_camera2_shutter_sound_entry_on">Acender</string>
   <string name="pref_camera2_shutter_sound_entry_off">Apagado</string>
   <string name="pref_camera2_shutter_sound_title">So do obturador</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Mono</string>
 </resources>
diff --git a/res/values-gu-rIN/qcomstrings.xml b/res/values-gu-rIN/qcomstrings.xml
index 13904735c..98025aded 100644
--- a/res/values-gu-rIN/qcomstrings.xml
+++ b/res/values-gu-rIN/qcomstrings.xml
@@ -131,7 +131,6 @@
   <!-- Settings screen, Select Redeye Reduction -->
   <string name="pref_camera_redeyereduction_title">રેડ આઇ રિડક્શન</string>
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">જ્યારે સ્થિરિકરણ/ટાઇમ લૅપ્સ/HDRનો ઉપયોગ કરો ત્યારે ઉચ્ચ ફ્રેમરેટ રેકૉર્ડિંગને સમર્થન નથી.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -310,11 +309,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">સેન્સર HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">મલ્ટિ-ફ્રેમ HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR માટે જરૂરી છે 1x ફ્રેમ</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">વિડિયો રોટેશન</string>
@@ -336,9 +330,13 @@
   <string name="all_in_focus">તમામ ફોકસમાં</string>
   <string name="refocus_toast">છેલ્લો ફોટો ફરી ફોકસ કરવા અહીં ટૅપ કરો</string>
   <!-- Help menu strings -->
+  <string name="pref_camera2_mono_only_entry_off">બંધ</string>
   <string name="pref_camera2_mono_preview_entry_off">બંધ</string>
   <string name="pref_camera2_clearsight_entry_off">બંધ</string>
   <string name="pref_camera2_mpo_entry_off">બંધ</string>
+  <string name="pref_camera2_makeup_entry_off">બંધ</string>
   <string name="pref_camera2_noise_reduction_entry_off">બંધ</string>
+  <string name="pref_camera2_trackingfocus_entry_off">બંધ</string>
   <string name="pref_camera2_shutter_sound_entry_off">બંધ</string>
+  <string name="pref_camera2_initial_camera_entry_mono">મોનો</string>
 </resources>
diff --git a/res/values-hi/qcomstrings.xml b/res/values-hi/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-hi/qcomstrings.xml
+++ b/res/values-hi/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-hr/qcomstrings.xml b/res/values-hr/qcomstrings.xml
index 78166503a..20c7f6d6d 100644
--- a/res/values-hr/qcomstrings.xml
+++ b/res/values-hr/qcomstrings.xml
@@ -131,7 +131,6 @@
   <!-- Settings screen, Select Redeye Reduction -->
   <string name="pref_camera_redeyereduction_title">Smanjenje efekta crvenih očiju</string>
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">Usporeni snimak nije podržan za DIS i Timelapse.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -311,11 +310,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">Senzor HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">Višeslikovni HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR treba 1x slika</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Rotacija videa</string>
@@ -339,6 +333,7 @@
   <!-- Help menu strings -->
   <string name="pref_camera2_camera2_entry_enable">Uključi</string>
   <string name="pref_camera2_camera2_entry_disable">Isključi</string>
+  <string name="pref_camera2_mono_only_entry_off">Isključen</string>
   <string name="pref_camera2_mono_preview_entry_on">Uključen</string>
   <string name="pref_camera2_mono_preview_entry_off">Isključen</string>
   <string name="pref_camera2_clearsight_entry_on">Uključen</string>
@@ -348,9 +343,12 @@
   <string name="pref_camera2_mpo_entry_on">Uključen</string>
   <string name="pref_camera2_mpo_entry_off">Isključen</string>
   <string name="pref_camera2_makeup_title">Šminka</string>
+  <string name="pref_camera2_makeup_entry_off">Isključen</string>
   <string name="pref_camera2_noise_reduction_entry_off">Isključen</string>
   <string name="pref_camera2_noise_reduction_entry_fast">Brzo</string>
   <string name="pref_camera2_videosnap_entry_enable">Uključi</string>
   <string name="pref_camera2_videosnap_entry_disable">Isključi</string>
+  <string name="pref_camera2_trackingfocus_entry_off">Isključen</string>
   <string name="pref_camera2_shutter_sound_entry_off">Isključen</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Mono</string>
 </resources>
diff --git a/res/values-hu/qcomstrings.xml b/res/values-hu/qcomstrings.xml
index b83147523..d573710df 100644
--- a/res/values-hu/qcomstrings.xml
+++ b/res/values-hu/qcomstrings.xml
@@ -160,7 +160,6 @@
   <string name="pref_camera_shuttersound_title" translatable="true">Zárhang</string>
   <string name="pref_camera_shuttersound_entry_enable">Engedélyezve</string>
   <string name="pref_camera_shuttersound_entry_disable">Kikapcsolva</string>
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">Lassított felvétel mód nem támogatott Stabilizáció/Gyorsított felvétel/HDR használatakor.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -364,11 +363,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">HDR szenzor</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">Multi-keret HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR 1x keretet igényel</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Videó elforgatás</string>
@@ -427,6 +421,7 @@
   <string name="pref_camera2_camera2_entry_enable">Engedélyezés</string>
   <string name="pref_camera2_camera2_entry_disable">Letiltás</string>
   <string name="pref_camera2_mono_only_title">Csak monokróm</string>
+  <string name="pref_camera2_mono_only_entry_off">Ki</string>
   <string name="pref_camera2_mono_preview_title">Monokróm előnézet</string>
   <string name="pref_camera2_mono_preview_entry_on">Be</string>
   <string name="pref_camera2_mono_preview_entry_off">Ki</string>
@@ -438,6 +433,7 @@
   <string name="pref_camera2_mpo_entry_on">Be</string>
   <string name="pref_camera2_mpo_entry_off">Ki</string>
   <string name="pref_camera2_makeup_title">Smink</string>
+  <string name="pref_camera2_makeup_entry_off">Ki</string>
   <string name="pref_camera2_noise_reduction_title">Zajcsökkentés</string>
   <string name="pref_camera2_noise_reduction_entry_off">Ki</string>
   <string name="pref_camera2_noise_reduction_entry_fast">Gyors</string>
@@ -446,10 +442,12 @@
   <string name="pref_camera2_videosnap_entry_enable">Engedélyezés</string>
   <string name="pref_camera2_videosnap_entry_disable">Letiltás</string>
   <string name="pref_camera2_trackingfocus_title">Fókuszkövetés</string>
+  <string name="pref_camera2_trackingfocus_entry_off">Ki</string>
   <string name="pref_camera_scenemode_entry_bestpicture">Legjobb kép</string>
   <string name="bestpicture_done">KÉSZ</string>
   <string name="bestpicture_at_least_one_picture">Legalább egy képet ki kell választani.</string>
   <string name="pref_camera2_shutter_sound_entry_on">Be</string>
   <string name="pref_camera2_shutter_sound_entry_off">Ki</string>
   <string name="pref_camera2_shutter_sound_title">Zárhang</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Fekete-fehér</string>
 </resources>
diff --git a/res/values-hy-rAM/qcomstrings.xml b/res/values-hy-rAM/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-hy-rAM/qcomstrings.xml
+++ b/res/values-hy-rAM/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-in/qcomstrings.xml b/res/values-in/qcomstrings.xml
index 873b03d13..d9d275f87 100644
--- a/res/values-in/qcomstrings.xml
+++ b/res/values-in/qcomstrings.xml
@@ -160,7 +160,6 @@
   <string name="pref_camera_shuttersound_title" translatable="true">Suara rana</string>
   <string name="pref_camera_shuttersound_entry_enable">Dihidupkan</string>
   <string name="pref_camera_shuttersound_entry_disable">Dimatikan</string>
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">Perekaman framerate tinggi tidak didukung pada saat menggunakan stabilisasi waktu selang/ HDR.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -364,11 +363,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">Sensor HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">HDR bingkai ganda</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR membutukan 1x bingkai</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Rotasi video</string>
@@ -426,6 +420,7 @@
   <string name="pref_camera2_camera2_entry_enable">Hidup</string>
   <string name="pref_camera2_camera2_entry_disable">Mati</string>
   <string name="pref_camera2_mono_only_title">Hanya mono</string>
+  <string name="pref_camera2_mono_only_entry_off">Tidak aktif</string>
   <string name="pref_camera2_mono_preview_title">Pratinjau mono</string>
   <string name="pref_camera2_mono_preview_entry_on">Hidup</string>
   <string name="pref_camera2_mono_preview_entry_off">Tidak aktif</string>
@@ -437,6 +432,7 @@
   <string name="pref_camera2_mpo_entry_on">Hidup</string>
   <string name="pref_camera2_mpo_entry_off">Tidak aktif</string>
   <string name="pref_camera2_makeup_title">Makeup</string>
+  <string name="pref_camera2_makeup_entry_off">Tidak aktif</string>
   <string name="pref_camera2_noise_reduction_title">Pengurangan kebisingan</string>
   <string name="pref_camera2_noise_reduction_entry_off">Tidak aktif</string>
   <string name="pref_camera2_noise_reduction_entry_fast">Cepat</string>
@@ -445,10 +441,12 @@
   <string name="pref_camera2_videosnap_entry_enable">Hidup</string>
   <string name="pref_camera2_videosnap_entry_disable">Mati</string>
   <string name="pref_camera2_trackingfocus_title">Fokus pelacakan</string>
+  <string name="pref_camera2_trackingfocus_entry_off">Tidak aktif</string>
   <string name="pref_camera_scenemode_entry_bestpicture">Gambar terbaik</string>
   <string name="bestpicture_done">SELESAI</string>
   <string name="bestpicture_at_least_one_picture">Setidaknya satu gambar harus dipilih.</string>
   <string name="pref_camera2_shutter_sound_entry_on">Hidup</string>
   <string name="pref_camera2_shutter_sound_entry_off">Tidak aktif</string>
   <string name="pref_camera2_shutter_sound_title">Suara rana</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Satu</string>
 </resources>
diff --git a/res/values-is-rIS/qcomstrings.xml b/res/values-is-rIS/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-is-rIS/qcomstrings.xml
+++ b/res/values-is-rIS/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-it/qcomstrings.xml b/res/values-it/qcomstrings.xml
index d70d7de08..4c8327d87 100644
--- a/res/values-it/qcomstrings.xml
+++ b/res/values-it/qcomstrings.xml
@@ -160,8 +160,6 @@
   <string name="pref_camera_shuttersound_title" translatable="true">Suono otturatore</string>
   <string name="pref_camera_shuttersound_entry_enable">Attivato</string>
   <string name="pref_camera_shuttersound_entry_disable">Disattivato</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">Alta velocità / Slow Motion non sono supportati per DIS e TimeLapse</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -365,11 +363,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">Sensore HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">HDR multi-frame</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR necessita del frame 1x</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Rotazione video</string>
@@ -428,6 +421,7 @@
   <string name="pref_camera2_camera2_entry_enable">Attiva</string>
   <string name="pref_camera2_camera2_entry_disable">Disattiva</string>
   <string name="pref_camera2_mono_only_title">Solo mono</string>
+  <string name="pref_camera2_mono_only_entry_off">Off</string>
   <string name="pref_camera2_mono_preview_title">Anteprima mono</string>
   <string name="pref_camera2_mono_preview_entry_on">On</string>
   <string name="pref_camera2_mono_preview_entry_off">Off</string>
@@ -439,6 +433,7 @@
   <string name="pref_camera2_mpo_entry_on">On</string>
   <string name="pref_camera2_mpo_entry_off">Off</string>
   <string name="pref_camera2_makeup_title">Makeup</string>
+  <string name="pref_camera2_makeup_entry_off">Off</string>
   <string name="pref_camera2_noise_reduction_title">Riduzione rumore</string>
   <string name="pref_camera2_noise_reduction_entry_off">Off</string>
   <string name="pref_camera2_noise_reduction_entry_fast">Veloce</string>
@@ -447,10 +442,12 @@
   <string name="pref_camera2_videosnap_entry_enable">Attiva</string>
   <string name="pref_camera2_videosnap_entry_disable">Disattiva</string>
   <string name="pref_camera2_trackingfocus_title">Traccia il fuoco</string>
+  <string name="pref_camera2_trackingfocus_entry_off">Off</string>
   <string name="pref_camera_scenemode_entry_bestpicture">Immagine migliore</string>
   <string name="bestpicture_done">FATTO</string>
   <string name="bestpicture_at_least_one_picture">Almeno un\'immagine deve essere selezionata.</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">Suono otturatore</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Mono</string>
 </resources>
diff --git a/res/values-iw/qcomstrings.xml b/res/values-iw/qcomstrings.xml
index 44c3226d3..77497f227 100644
--- a/res/values-iw/qcomstrings.xml
+++ b/res/values-iw/qcomstrings.xml
@@ -160,7 +160,6 @@
   <string name="pref_camera_shuttersound_title" translatable="true">צליל תריס</string>
   <string name="pref_camera_shuttersound_entry_enable">מופעל</string>
   <string name="pref_camera_shuttersound_entry_disable">מושבת</string>
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">הקלטה במהירות פריימים גבוהה אינה נתמכת בעת שימוש בייצוב תמונה דיגיטלי/צילום מואץ/HDR.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -364,11 +363,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">חיישן HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">HDR מרובה פריימים</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">לצילום HDR דרוש פריים 1x</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">סיבוב וידאו</string>
@@ -427,6 +421,7 @@
   <string name="pref_camera2_camera2_entry_enable">אפשר</string>
   <string name="pref_camera2_camera2_entry_disable">השבת</string>
   <string name="pref_camera2_mono_only_title">מונו בלבד</string>
+  <string name="pref_camera2_mono_only_entry_off">כבוי</string>
   <string name="pref_camera2_mono_preview_title">תצוגה מקדימה למונו</string>
   <string name="pref_camera2_mono_preview_entry_on">מופעל</string>
   <string name="pref_camera2_mono_preview_entry_off">כבוי</string>
@@ -438,6 +433,7 @@
   <string name="pref_camera2_mpo_entry_on">מופעל</string>
   <string name="pref_camera2_mpo_entry_off">כבוי</string>
   <string name="pref_camera2_makeup_title">איפור (Makeup)</string>
+  <string name="pref_camera2_makeup_entry_off">כבוי</string>
   <string name="pref_camera2_noise_reduction_title">הפחתת רעש</string>
   <string name="pref_camera2_noise_reduction_entry_off">כבוי</string>
   <string name="pref_camera2_noise_reduction_entry_fast">מהיר</string>
@@ -446,10 +442,12 @@
   <string name="pref_camera2_videosnap_entry_enable">אפשר</string>
   <string name="pref_camera2_videosnap_entry_disable">השבת</string>
   <string name="pref_camera2_trackingfocus_title">מעקב מיקוד</string>
+  <string name="pref_camera2_trackingfocus_entry_off">כבוי</string>
   <string name="pref_camera_scenemode_entry_bestpicture">התמונה הטובה ביותר</string>
   <string name="bestpicture_done">הסתיים</string>
   <string name="bestpicture_at_least_one_picture">יש לבחור לפחות תמונה אחת.</string>
   <string name="pref_camera2_shutter_sound_entry_on">מופעל</string>
   <string name="pref_camera2_shutter_sound_entry_off">כבוי</string>
   <string name="pref_camera2_shutter_sound_title">צליל תריס</string>
+  <string name="pref_camera2_initial_camera_entry_mono">מונוכרום</string>
 </resources>
diff --git a/res/values-ja/qcomstrings.xml b/res/values-ja/qcomstrings.xml
index 938929fbc..39ab3bf8f 100644
--- a/res/values-ja/qcomstrings.xml
+++ b/res/values-ja/qcomstrings.xml
@@ -160,7 +160,6 @@
   <string name="pref_camera_shuttersound_title" translatable="true">シャッター音</string>
   <string name="pref_camera_shuttersound_entry_enable">有効</string>
   <string name="pref_camera_shuttersound_entry_disable">無効</string>
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">高フレームレート録画は手ぶれ補正/低速度撮影/HDR使用時は使用できません。</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -364,11 +363,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">センサーHDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">マルチフレームHDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDRは等倍速フレームを必要とします</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">動画の回転</string>
@@ -427,6 +421,7 @@
   <string name="pref_camera2_camera2_entry_enable">有効</string>
   <string name="pref_camera2_camera2_entry_disable">無効</string>
   <string name="pref_camera2_mono_only_title">モノクロのみ</string>
+  <string name="pref_camera2_mono_only_entry_off">OFF</string>
   <string name="pref_camera2_mono_preview_title">モノクロプレビュー</string>
   <string name="pref_camera2_mono_preview_entry_on">ON</string>
   <string name="pref_camera2_mono_preview_entry_off">OFF</string>
@@ -438,6 +433,7 @@
   <string name="pref_camera2_mpo_entry_on">ON</string>
   <string name="pref_camera2_mpo_entry_off">OFF</string>
   <string name="pref_camera2_makeup_title">メイクアップ</string>
+  <string name="pref_camera2_makeup_entry_off">OFF</string>
   <string name="pref_camera2_noise_reduction_title">ノイズリダクション</string>
   <string name="pref_camera2_noise_reduction_entry_off">OFF</string>
   <string name="pref_camera2_noise_reduction_entry_fast">高速</string>
@@ -446,10 +442,12 @@
   <string name="pref_camera2_videosnap_entry_enable">有効</string>
   <string name="pref_camera2_videosnap_entry_disable">無効</string>
   <string name="pref_camera2_trackingfocus_title">追尾フォーカス</string>
+  <string name="pref_camera2_trackingfocus_entry_off">OFF</string>
   <string name="pref_camera_scenemode_entry_bestpicture">最高の写真</string>
   <string name="bestpicture_done">完了</string>
   <string name="bestpicture_at_least_one_picture">少なくとも1枚の写真を選んでください。</string>
   <string name="pref_camera2_shutter_sound_entry_on">ON</string>
   <string name="pref_camera2_shutter_sound_entry_off">OFF</string>
   <string name="pref_camera2_shutter_sound_title">シャッター音</string>
+  <string name="pref_camera2_initial_camera_entry_mono">モノクロ</string>
 </resources>
diff --git a/res/values-ka-rGE/qcomstrings.xml b/res/values-ka-rGE/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-ka-rGE/qcomstrings.xml
+++ b/res/values-ka-rGE/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-kab-rDZ/qcomstrings.xml b/res/values-kab-rDZ/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-kab-rDZ/qcomstrings.xml
+++ b/res/values-kab-rDZ/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-kk-rKZ/qcomstrings.xml b/res/values-kk-rKZ/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-kk-rKZ/qcomstrings.xml
+++ b/res/values-kk-rKZ/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-km-rKH/qcomstrings.xml b/res/values-km-rKH/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-km-rKH/qcomstrings.xml
+++ b/res/values-km-rKH/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-kn-rIN/qcomstrings.xml b/res/values-kn-rIN/qcomstrings.xml
index 85fcf35fc..e902f4213 100644
--- a/res/values-kn-rIN/qcomstrings.xml
+++ b/res/values-kn-rIN/qcomstrings.xml
@@ -131,7 +131,6 @@
   <!-- Settings screen, Select Redeye Reduction -->
   <string name="pref_camera_redeyereduction_title">ಕೆಂಪು ಕಣ್ಣು ಕಡಿತ</string>
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">ಸ್ಥಿರೀಕರಣ/ಮೀರಿದ ಸಮಯ/HDR ಬಳಸುವಾಗ ಅಧಿಕ-ಫ್ರೇಮ್‌ರೇಟ್‌ ರೆಕಾರ್ಡಿಂಗ್‌ ಬೆಂಬಲಿಸುವುದಿಲ್ಲ.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -310,11 +309,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">ಸೆನ್ಸರ್‌ HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">ಮಲ್ಟಿ-ಫ್ರೇಮ್‌ HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR ಗೆ 1x ಫ್ರೇಮ್‌ ಅಗತ್ಯವಿದೆ</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">ವಿಡಿಯೋ ಸುತ್ತುವಿಕೆ</string>
@@ -336,9 +330,13 @@
   <string name="all_in_focus">ಎಲ್ಲವೂ ಫೋಕಸ್‌ನಲ್ಲಿ</string>
   <string name="refocus_toast">ಕೊನೆಯ ಫೊಟೋ ರಿ-ಫೋಕಸ್‌ ಮಾಡಲು, ಇಲ್ಲಿ ತಟ್ಟಿ</string>
   <!-- Help menu strings -->
+  <string name="pref_camera2_mono_only_entry_off">ಆಫ್ ಆಗಿದೆ</string>
   <string name="pref_camera2_mono_preview_entry_off">ಆಫ್ ಆಗಿದೆ</string>
   <string name="pref_camera2_clearsight_entry_off">ಆಫ್ ಆಗಿದೆ</string>
   <string name="pref_camera2_mpo_entry_off">ಆಫ್ ಆಗಿದೆ</string>
+  <string name="pref_camera2_makeup_entry_off">ಆಫ್ ಆಗಿದೆ</string>
   <string name="pref_camera2_noise_reduction_entry_off">ಆಫ್ ಆಗಿದೆ</string>
+  <string name="pref_camera2_trackingfocus_entry_off">ಆಫ್ ಆಗಿದೆ</string>
   <string name="pref_camera2_shutter_sound_entry_off">ಆಫ್ ಆಗಿದೆ</string>
+  <string name="pref_camera2_initial_camera_entry_mono">ಮೊನೊ</string>
 </resources>
diff --git a/res/values-ko/qcomstrings.xml b/res/values-ko/qcomstrings.xml
index a1056e9e1..1ff4c6759 100644
--- a/res/values-ko/qcomstrings.xml
+++ b/res/values-ko/qcomstrings.xml
@@ -160,7 +160,6 @@
   <string name="pref_camera_shuttersound_title" translatable="true">촬영음</string>
   <string name="pref_camera_shuttersound_entry_enable">사용</string>
   <string name="pref_camera_shuttersound_entry_disable">사용 안 함</string>
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">비디오 안정화 모드, 시간 경과 모드와 HDR 모드에서는 고속 카메라/슬로우 모션이 지원되지 않습니다.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -364,11 +363,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">센서 HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">멀티 프레임 HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR은 1x 프레임이 필요합니다</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">비디오 회전</string>
@@ -427,6 +421,7 @@
   <string name="pref_camera2_camera2_entry_enable">사용</string>
   <string name="pref_camera2_camera2_entry_disable">사용 안 함</string>
   <string name="pref_camera2_mono_only_title">흑백만 사용</string>
+  <string name="pref_camera2_mono_only_entry_off">끄기</string>
   <string name="pref_camera2_mono_preview_title">흑백으로 미리보기</string>
   <string name="pref_camera2_mono_preview_entry_on">켜짐</string>
   <string name="pref_camera2_mono_preview_entry_off">끄기</string>
@@ -438,6 +433,7 @@
   <string name="pref_camera2_mpo_entry_on">켜짐</string>
   <string name="pref_camera2_mpo_entry_off">끄기</string>
   <string name="pref_camera2_makeup_title">메이크업</string>
+  <string name="pref_camera2_makeup_entry_off">끄기</string>
   <string name="pref_camera2_noise_reduction_title">노이즈 감소</string>
   <string name="pref_camera2_noise_reduction_entry_off">끄기</string>
   <string name="pref_camera2_noise_reduction_entry_fast">빠르게</string>
@@ -446,10 +442,12 @@
   <string name="pref_camera2_videosnap_entry_enable">사용</string>
   <string name="pref_camera2_videosnap_entry_disable">사용 안 함</string>
   <string name="pref_camera2_trackingfocus_title">초점 추적</string>
+  <string name="pref_camera2_trackingfocus_entry_off">끄기</string>
   <string name="pref_camera_scenemode_entry_bestpicture">잘 찍은 사진</string>
   <string name="bestpicture_done">완료</string>
   <string name="bestpicture_at_least_one_picture">적어도 하나의 사진은 선택해야 합니다.</string>
   <string name="pref_camera2_shutter_sound_entry_on">켜짐</string>
   <string name="pref_camera2_shutter_sound_entry_off">끄기</string>
   <string name="pref_camera2_shutter_sound_title">촬영음</string>
+  <string name="pref_camera2_initial_camera_entry_mono">모노</string>
 </resources>
diff --git a/res/values-ku/qcomstrings.xml b/res/values-ku/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-ku/qcomstrings.xml
+++ b/res/values-ku/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-ky-rKG/qcomstrings.xml b/res/values-ky-rKG/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-ky-rKG/qcomstrings.xml
+++ b/res/values-ky-rKG/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-lb/qcomstrings.xml b/res/values-lb/qcomstrings.xml
index 35fddbdac..a735aac11 100644
--- a/res/values-lb/qcomstrings.xml
+++ b/res/values-lb/qcomstrings.xml
@@ -130,7 +130,6 @@
   <!-- Settings screen, Select Redeye Reduction -->
   <string name="pref_camera_redeyereduction_title">Reduzéierung vu rouden Aen</string>
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <string name="error_app_unsupported_hfr">Zäitluppe-Videoe gi bei der ausgewielter Opléisung net ënnerstëtzt</string>
@@ -303,11 +302,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">Sensor-HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">Méibild-HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR brauch 1x Bild</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Videorotéierung</string>
@@ -324,9 +318,13 @@
   <string name="camera_gesture_title">Fotoapparat starten</string>
   <string name="pref_camera_tsmakeup_entry_off">Aus</string>
   <!-- Help menu strings -->
+  <string name="pref_camera2_mono_only_entry_off">Aus</string>
   <string name="pref_camera2_mono_preview_entry_off">Aus</string>
   <string name="pref_camera2_clearsight_entry_off">Aus</string>
   <string name="pref_camera2_mpo_entry_off">Aus</string>
+  <string name="pref_camera2_makeup_entry_off">Aus</string>
   <string name="pref_camera2_noise_reduction_entry_off">Aus</string>
+  <string name="pref_camera2_trackingfocus_entry_off">Aus</string>
   <string name="pref_camera2_shutter_sound_entry_off">Aus</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Mono</string>
 </resources>
diff --git a/res/values-lo-rLA/qcomstrings.xml b/res/values-lo-rLA/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-lo-rLA/qcomstrings.xml
+++ b/res/values-lo-rLA/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-lt/qcomstrings.xml b/res/values-lt/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-lt/qcomstrings.xml
+++ b/res/values-lt/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-lv/qcomstrings.xml b/res/values-lv/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-lv/qcomstrings.xml
+++ b/res/values-lv/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-mk-rMK/qcomstrings.xml b/res/values-mk-rMK/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-mk-rMK/qcomstrings.xml
+++ b/res/values-mk-rMK/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-ml-rIN/qcomstrings.xml b/res/values-ml-rIN/qcomstrings.xml
index d55973c43..ff0ffd671 100644
--- a/res/values-ml-rIN/qcomstrings.xml
+++ b/res/values-ml-rIN/qcomstrings.xml
@@ -131,7 +131,6 @@
   <!-- Settings screen, Select Redeye Reduction -->
   <string name="pref_camera_redeyereduction_title">റെഡ് ഐ റിഡക്ഷന്‍</string>
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">സ്റ്റെബിലൈസേഷന്‍/ ടൈം ലാപ്സ് / HDR എന്നിവ ഉപയോഗിക്കുമ്പോൾ ഹൈ-ഫ്രെയിംറേറ്റ് റെക്കോർഡിംഗ് പിന്തുണയ്ക്കില്ല.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -310,11 +309,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">സെന്‍സര്‍ HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">മള്‍ട്ടി-ഫ്രെയിം-HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR ന് 1x ഫ്രെയിം ആവശ്യമാണ്‌</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">വീഡിയോ തിരിയല്‍</string>
@@ -336,9 +330,13 @@
   <string name="all_in_focus">എല്ലാ ഫോക്കസിൽ</string>
   <string name="refocus_toast">അവസാന ഫോട്ടോ വീണ്ടും ഫോക്കസ് ചെയ്യുന്നതിന്, ഇവിടെ അമര്‍ത്തുക</string>
   <!-- Help menu strings -->
+  <string name="pref_camera2_mono_only_entry_off">ഓഫാണ്</string>
   <string name="pref_camera2_mono_preview_entry_off">ഓഫാണ്</string>
   <string name="pref_camera2_clearsight_entry_off">ഓഫാണ്</string>
   <string name="pref_camera2_mpo_entry_off">ഓഫാണ്</string>
+  <string name="pref_camera2_makeup_entry_off">ഓഫാണ്</string>
   <string name="pref_camera2_noise_reduction_entry_off">ഓഫാണ്</string>
+  <string name="pref_camera2_trackingfocus_entry_off">ഓഫാണ്</string>
   <string name="pref_camera2_shutter_sound_entry_off">ഓഫാണ്</string>
+  <string name="pref_camera2_initial_camera_entry_mono">മോണോ</string>
 </resources>
diff --git a/res/values-mn-rMN/qcomstrings.xml b/res/values-mn-rMN/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-mn-rMN/qcomstrings.xml
+++ b/res/values-mn-rMN/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-mr-rIN/qcomstrings.xml b/res/values-mr-rIN/qcomstrings.xml
index 98a6f01fe..e551afc4b 100644
--- a/res/values-mr-rIN/qcomstrings.xml
+++ b/res/values-mr-rIN/qcomstrings.xml
@@ -131,7 +131,6 @@
   <!-- Settings screen, Select Redeye Reduction -->
   <string name="pref_camera_redeyereduction_title">लाल बुबुळ घट</string>
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">स्टॅबिलायझेशन/टाईम लॅप्स/HDR वापरताना उच्च-चौकटदर रेकॉर्डिंग समर्थित नाही</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -310,11 +309,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">सेन्सर HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">बहु-चौकट HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR ला 1x चौकट आवश्यक आहे</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">व्हिडिओ रोटेशन</string>
@@ -336,9 +330,13 @@
   <string name="all_in_focus">सर्व फोकसमध्ये</string>
   <string name="refocus_toast">शेवटचा फोटो रि-फोकस करण्यासाठी, इथे टॅप करा</string>
   <!-- Help menu strings -->
+  <string name="pref_camera2_mono_only_entry_off">बंद</string>
   <string name="pref_camera2_mono_preview_entry_off">बंद</string>
   <string name="pref_camera2_clearsight_entry_off">बंद</string>
   <string name="pref_camera2_mpo_entry_off">बंद</string>
+  <string name="pref_camera2_makeup_entry_off">बंद</string>
   <string name="pref_camera2_noise_reduction_entry_off">बंद</string>
+  <string name="pref_camera2_trackingfocus_entry_off">बंद</string>
   <string name="pref_camera2_shutter_sound_entry_off">बंद</string>
+  <string name="pref_camera2_initial_camera_entry_mono">मोनो</string>
 </resources>
diff --git a/res/values-ms-rMY/qcomstrings.xml b/res/values-ms-rMY/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-ms-rMY/qcomstrings.xml
+++ b/res/values-ms-rMY/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-my-rMM/qcomstrings.xml b/res/values-my-rMM/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-my-rMM/qcomstrings.xml
+++ b/res/values-my-rMM/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-nb/qcomstrings.xml b/res/values-nb/qcomstrings.xml
index 12a47375d..db375aa90 100644
--- a/res/values-nb/qcomstrings.xml
+++ b/res/values-nb/qcomstrings.xml
@@ -160,7 +160,6 @@
   <string name="pref_camera_shuttersound_title" translatable="true">Lukkerlyd</string>
   <string name="pref_camera_shuttersound_entry_enable">Aktivert</string>
   <string name="pref_camera_shuttersound_entry_disable">Deaktivert</string>
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">Høyhastighets/sakte film støttes ikke for DIS og TimeLapse</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -364,11 +363,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">Sensor HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">Multi-bilde HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR trenger 1x bilde</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Videorotering</string>
@@ -427,6 +421,7 @@
   <string name="pref_camera2_camera2_entry_enable">Aktiver</string>
   <string name="pref_camera2_camera2_entry_disable">Deaktiver</string>
   <string name="pref_camera2_mono_only_title">Bare mono</string>
+  <string name="pref_camera2_mono_only_entry_off">Av</string>
   <string name="pref_camera2_mono_preview_title">Mono forhåndsvisning</string>
   <string name="pref_camera2_mono_preview_entry_on">På</string>
   <string name="pref_camera2_mono_preview_entry_off">Av</string>
@@ -438,6 +433,7 @@
   <string name="pref_camera2_mpo_entry_on">På</string>
   <string name="pref_camera2_mpo_entry_off">Av</string>
   <string name="pref_camera2_makeup_title">Sminke</string>
+  <string name="pref_camera2_makeup_entry_off">Av</string>
   <string name="pref_camera2_noise_reduction_title">Støyreduksjon</string>
   <string name="pref_camera2_noise_reduction_entry_off">Av</string>
   <string name="pref_camera2_noise_reduction_entry_fast">Rask</string>
@@ -446,10 +442,12 @@
   <string name="pref_camera2_videosnap_entry_enable">Aktiver</string>
   <string name="pref_camera2_videosnap_entry_disable">Deaktiver</string>
   <string name="pref_camera2_trackingfocus_title">Sporer fokus</string>
+  <string name="pref_camera2_trackingfocus_entry_off">Av</string>
   <string name="pref_camera_scenemode_entry_bestpicture">Beste bilde</string>
   <string name="bestpicture_done">FERDIG</string>
   <string name="bestpicture_at_least_one_picture">Minst ett bilde må velges.</string>
   <string name="pref_camera2_shutter_sound_entry_on">På</string>
   <string name="pref_camera2_shutter_sound_entry_off">Av</string>
   <string name="pref_camera2_shutter_sound_title">Lukkerlyd</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Mono</string>
 </resources>
diff --git a/res/values-ne-rNP/qcomstrings.xml b/res/values-ne-rNP/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-ne-rNP/qcomstrings.xml
+++ b/res/values-ne-rNP/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-nl/qcomstrings.xml b/res/values-nl/qcomstrings.xml
index 2fc771ca3..673dcbc8b 100644
--- a/res/values-nl/qcomstrings.xml
+++ b/res/values-nl/qcomstrings.xml
@@ -160,7 +160,6 @@
   <string name="pref_camera_shuttersound_title" translatable="true">Sluitergeluid</string>
   <string name="pref_camera_shuttersound_entry_enable">Ingeschakeld</string>
   <string name="pref_camera_shuttersound_entry_disable">Uitgeschakeld</string>
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">Opname met hoge beeldsnelheid wordt niet ondersteund bij digitale beeldstabilisatie, time-lapse of HDR.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -364,11 +363,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">Sensor HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">Multi-frame HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR heeft 1x beeld nodig</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Videorotatie</string>
@@ -427,6 +421,7 @@
   <string name="pref_camera2_camera2_entry_enable">Inschakelen</string>
   <string name="pref_camera2_camera2_entry_disable">Uitschakelen</string>
   <string name="pref_camera2_mono_only_title">Alleen mono</string>
+  <string name="pref_camera2_mono_only_entry_off">Uit</string>
   <string name="pref_camera2_mono_preview_title">Mono preview</string>
   <string name="pref_camera2_mono_preview_entry_on">Aan</string>
   <string name="pref_camera2_mono_preview_entry_off">Uit</string>
@@ -438,6 +433,7 @@
   <string name="pref_camera2_mpo_entry_on">Aan</string>
   <string name="pref_camera2_mpo_entry_off">Uit</string>
   <string name="pref_camera2_makeup_title">Make-up</string>
+  <string name="pref_camera2_makeup_entry_off">Uit</string>
   <string name="pref_camera2_noise_reduction_title">Ruisonderdrukking</string>
   <string name="pref_camera2_noise_reduction_entry_off">Uit</string>
   <string name="pref_camera2_noise_reduction_entry_fast">Snel</string>
@@ -446,10 +442,12 @@
   <string name="pref_camera2_videosnap_entry_enable">Inschakelen</string>
   <string name="pref_camera2_videosnap_entry_disable">Uitschakelen</string>
   <string name="pref_camera2_trackingfocus_title">Focus volgt object</string>
+  <string name="pref_camera2_trackingfocus_entry_off">Uit</string>
   <string name="pref_camera_scenemode_entry_bestpicture">Beste foto</string>
   <string name="bestpicture_done">KLAAR</string>
   <string name="bestpicture_at_least_one_picture">Er moet ten minste één foto worden gekozen.</string>
   <string name="pref_camera2_shutter_sound_entry_on">Aan</string>
   <string name="pref_camera2_shutter_sound_entry_off">Uit</string>
   <string name="pref_camera2_shutter_sound_title">Sluitergeluid</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Monochroom</string>
 </resources>
diff --git a/res/values-oc-rFR/qcomstrings.xml b/res/values-oc-rFR/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-oc-rFR/qcomstrings.xml
+++ b/res/values-oc-rFR/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-or-rIN/qcomstrings.xml b/res/values-or-rIN/qcomstrings.xml
index cf79054f0..7b6afd9d3 100644
--- a/res/values-or-rIN/qcomstrings.xml
+++ b/res/values-or-rIN/qcomstrings.xml
@@ -131,7 +131,6 @@
   <!-- Settings screen, Select Redeye Reduction -->
   <string name="pref_camera_redeyereduction_title">ନାଲି ଆଖି ହ୍ରାସ</string>
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">ଷ୍ଟାବିଲାଇଜେସନ୍‍/ଟାଇମ୍‍ ଲାପ୍ସ/HDR ବ୍ୟବହାର ସମୟରେ ଅଧିକ ଫ୍ରେମ୍‍ହାର ଥିବା ରେକର୍ଡିଂ ସମଥନ କରେ ନାହିଁ।</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -310,11 +309,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">ସେନ୍‍ସର୍‍ HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">ମଲ୍ଟି-ଫ୍ରେମ୍‍ HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR ଆବ୍ଶ୍ୟକ କରେ 1x frame</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">ଭିଡିଓ ଘୂର୍ଣ୍ଣନ</string>
@@ -336,9 +330,13 @@
   <string name="all_in_focus">ଫୋକସ୍‍ରେ ସମସ୍ତ</string>
   <string name="refocus_toast">ଶେଷ ଫଟୋ ରି-ଫୋକସ୍‍ କରିବା ପାଇଁ, ଏଠାରେ ସ୍ପର୍ଶ କରନ୍ତୁ</string>
   <!-- Help menu strings -->
+  <string name="pref_camera2_mono_only_entry_off">ଅଫ୍</string>
   <string name="pref_camera2_mono_preview_entry_off">ଅଫ୍</string>
   <string name="pref_camera2_clearsight_entry_off">ଅଫ୍</string>
   <string name="pref_camera2_mpo_entry_off">ଅଫ୍</string>
+  <string name="pref_camera2_makeup_entry_off">ଅଫ୍</string>
   <string name="pref_camera2_noise_reduction_entry_off">ଅଫ୍</string>
+  <string name="pref_camera2_trackingfocus_entry_off">ଅଫ୍</string>
   <string name="pref_camera2_shutter_sound_entry_off">ଅଫ୍</string>
+  <string name="pref_camera2_initial_camera_entry_mono">ମୋନୋ</string>
 </resources>
diff --git a/res/values-pa-rIN/qcomstrings.xml b/res/values-pa-rIN/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-pa-rIN/qcomstrings.xml
+++ b/res/values-pa-rIN/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-pl/qcomstrings.xml b/res/values-pl/qcomstrings.xml
index 16c74b7eb..ab026b954 100644
--- a/res/values-pl/qcomstrings.xml
+++ b/res/values-pl/qcomstrings.xml
@@ -160,7 +160,6 @@
   <string name="pref_camera_shuttersound_title" translatable="true">Dźwięk migawki</string>
   <string name="pref_camera_shuttersound_entry_enable">Włączone</string>
   <string name="pref_camera_shuttersound_entry_disable">Wyłączone</string>
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">Nagrywanie z dużą ilością klatek nie jest obsługiwane dla cyfrowej stabilizacji obrazu, TimeLapse i HDR.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -364,11 +363,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">Czujnik HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">Wieloklatkowy HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR potrzebuje pełnej klatki</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Orientacja wideo</string>
@@ -427,6 +421,7 @@
   <string name="pref_camera2_camera2_entry_enable">Włącz</string>
   <string name="pref_camera2_camera2_entry_disable">Wyłącz</string>
   <string name="pref_camera2_mono_only_title">Tylko monochromatyczny</string>
+  <string name="pref_camera2_mono_only_entry_off">Wyłączone</string>
   <string name="pref_camera2_mono_preview_title">Podgląd monochromatyczny</string>
   <string name="pref_camera2_mono_preview_entry_on">Włączone</string>
   <string name="pref_camera2_mono_preview_entry_off">Wyłączone</string>
@@ -438,6 +433,7 @@
   <string name="pref_camera2_mpo_entry_on">Włączone</string>
   <string name="pref_camera2_mpo_entry_off">Wyłączone</string>
   <string name="pref_camera2_makeup_title">Makijaż</string>
+  <string name="pref_camera2_makeup_entry_off">Wyłączone</string>
   <string name="pref_camera2_noise_reduction_title">Redukcja szumów</string>
   <string name="pref_camera2_noise_reduction_entry_off">Wyłączone</string>
   <string name="pref_camera2_noise_reduction_entry_fast">Szybka</string>
@@ -446,10 +442,12 @@
   <string name="pref_camera2_videosnap_entry_enable">Wł.</string>
   <string name="pref_camera2_videosnap_entry_disable">Wył.</string>
   <string name="pref_camera2_trackingfocus_title">Śledzenie ostrości</string>
+  <string name="pref_camera2_trackingfocus_entry_off">Wyłączone</string>
   <string name="pref_camera_scenemode_entry_bestpicture">Najlepsze zdjęcie</string>
   <string name="bestpicture_done">GOTOWE</string>
   <string name="bestpicture_at_least_one_picture">Musisz wybrać przynajmniej jedno zdjęcie.</string>
   <string name="pref_camera2_shutter_sound_entry_on">Włączone</string>
   <string name="pref_camera2_shutter_sound_entry_off">Wyłączone</string>
   <string name="pref_camera2_shutter_sound_title">Dźwięk migawki</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Monochromatyczny</string>
 </resources>
diff --git a/res/values-pt-rBR/qcomstrings.xml b/res/values-pt-rBR/qcomstrings.xml
index 91e933c65..e825dff75 100644
--- a/res/values-pt-rBR/qcomstrings.xml
+++ b/res/values-pt-rBR/qcomstrings.xml
@@ -160,7 +160,6 @@
   <string name="pref_camera_shuttersound_title" translatable="true">Som de captura</string>
   <string name="pref_camera_shuttersound_entry_enable">Ligado</string>
   <string name="pref_camera_shuttersound_entry_disable">Desligado</string>
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">Taxa de quadros alta não é suportada quando estiver usando Estabilização/Time lapse/HDR.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -364,11 +363,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">Sensor de HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">HDR multi-quadros</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR precisa de quadro 1x</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Rotação de vídeo</string>
@@ -427,6 +421,7 @@
   <string name="pref_camera2_camera2_entry_enable">Ativar</string>
   <string name="pref_camera2_camera2_entry_disable">Desativar</string>
   <string name="pref_camera2_mono_only_title">Somente monocromático</string>
+  <string name="pref_camera2_mono_only_entry_off">Desl.</string>
   <string name="pref_camera2_mono_preview_title">Pré-visualização em monocromático</string>
   <string name="pref_camera2_mono_preview_entry_on">Ativado</string>
   <string name="pref_camera2_mono_preview_entry_off">Desl.</string>
@@ -438,6 +433,7 @@
   <string name="pref_camera2_mpo_entry_on">Ativado</string>
   <string name="pref_camera2_mpo_entry_off">Desl.</string>
   <string name="pref_camera2_makeup_title">Maquiagem</string>
+  <string name="pref_camera2_makeup_entry_off">Desl.</string>
   <string name="pref_camera2_noise_reduction_title">Redução de ruídos</string>
   <string name="pref_camera2_noise_reduction_entry_off">Desl.</string>
   <string name="pref_camera2_noise_reduction_entry_fast">Rápido</string>
@@ -446,10 +442,12 @@
   <string name="pref_camera2_videosnap_entry_enable">Ativar</string>
   <string name="pref_camera2_videosnap_entry_disable">Desativar</string>
   <string name="pref_camera2_trackingfocus_title">Rastreamento de foco</string>
+  <string name="pref_camera2_trackingfocus_entry_off">Desl.</string>
   <string name="pref_camera_scenemode_entry_bestpicture">Melhor imagem</string>
   <string name="bestpicture_done">CONCLUÍDO</string>
   <string name="bestpicture_at_least_one_picture">Pelo menos uma imagem deve ser escolhida.</string>
   <string name="pref_camera2_shutter_sound_entry_on">Ativado</string>
   <string name="pref_camera2_shutter_sound_entry_off">Desl.</string>
   <string name="pref_camera2_shutter_sound_title">Som de captura</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Monocromático</string>
 </resources>
diff --git a/res/values-pt-rPT/qcomstrings.xml b/res/values-pt-rPT/qcomstrings.xml
index ea3296d26..183b65271 100644
--- a/res/values-pt-rPT/qcomstrings.xml
+++ b/res/values-pt-rPT/qcomstrings.xml
@@ -160,7 +160,6 @@
   <string name="pref_camera_shuttersound_title" translatable="true">Som do obturador</string>
   <string name="pref_camera_shuttersound_entry_enable">Ativado</string>
   <string name="pref_camera_shuttersound_entry_disable">Desativado</string>
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">A gravação com elevado framerate não é suportada quando a estabilização, o intervalo de tempo ou o HDR estão ativados.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -364,11 +363,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">Sensor HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">HDR multi-frame</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">O HDR necessita de 1x frame</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Rotação do vídeo</string>
@@ -427,6 +421,7 @@
   <string name="pref_camera2_camera2_entry_enable">Ativar</string>
   <string name="pref_camera2_camera2_entry_disable">Desativar</string>
   <string name="pref_camera2_mono_only_title">Apenas Monocromático</string>
+  <string name="pref_camera2_mono_only_entry_off">Desativada</string>
   <string name="pref_camera2_mono_preview_title">Pré-visualização em Monocromático</string>
   <string name="pref_camera2_mono_preview_entry_on">Ligado</string>
   <string name="pref_camera2_mono_preview_entry_off">Desativada</string>
@@ -438,6 +433,7 @@
   <string name="pref_camera2_mpo_entry_on">Ligado</string>
   <string name="pref_camera2_mpo_entry_off">Desativada</string>
   <string name="pref_camera2_makeup_title">Maquilhagem</string>
+  <string name="pref_camera2_makeup_entry_off">Desativada</string>
   <string name="pref_camera2_noise_reduction_title">Redução de ruído</string>
   <string name="pref_camera2_noise_reduction_entry_off">Desativada</string>
   <string name="pref_camera2_noise_reduction_entry_fast">Rápida</string>
@@ -446,10 +442,12 @@
   <string name="pref_camera2_videosnap_entry_enable">Ativar</string>
   <string name="pref_camera2_videosnap_entry_disable">Desativar</string>
   <string name="pref_camera2_trackingfocus_title">Rastreamento de foco</string>
+  <string name="pref_camera2_trackingfocus_entry_off">Desativada</string>
   <string name="pref_camera_scenemode_entry_bestpicture">Melhor imagem</string>
   <string name="bestpicture_done">CONCLUÍDO</string>
   <string name="bestpicture_at_least_one_picture">Tem de escolher, pelo menos, uma fotografia.</string>
   <string name="pref_camera2_shutter_sound_entry_on">Ligado</string>
   <string name="pref_camera2_shutter_sound_entry_off">Desativada</string>
   <string name="pref_camera2_shutter_sound_title">Som do obturador</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Monocromático</string>
 </resources>
diff --git a/res/values-rm/qcomstrings.xml b/res/values-rm/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-rm/qcomstrings.xml
+++ b/res/values-rm/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-ro/qcomstrings.xml b/res/values-ro/qcomstrings.xml
index e5f998425..3baa1fa95 100644
--- a/res/values-ro/qcomstrings.xml
+++ b/res/values-ro/qcomstrings.xml
@@ -160,8 +160,6 @@
   <string name="pref_camera_shuttersound_title" translatable="true">Sunet obturator</string>
   <string name="pref_camera_shuttersound_entry_enable">Activat</string>
   <string name="pref_camera_shuttersound_entry_disable">Dezactivat</string>
-  <!-- Default mce setting. Do not translate. -->
-  <string name="pref_camera_mce_default">activați</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">Înregistrarea cu frecvenţă mare de cadre nu este suportată atunci când utilizaţi Stabilizare/Time lapse/HDR.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -365,11 +363,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">Senzor HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">HDR multi-cadru</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR are nevoie de 1x cadru</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Rotire video</string>
@@ -428,6 +421,7 @@
   <string name="pref_camera2_camera2_entry_enable">Activați</string>
   <string name="pref_camera2_camera2_entry_disable">Dezactivați</string>
   <string name="pref_camera2_mono_only_title">Doar mono</string>
+  <string name="pref_camera2_mono_only_entry_off">Oprit</string>
   <string name="pref_camera2_mono_preview_title">Previzualizare mono</string>
   <string name="pref_camera2_mono_preview_entry_on">Activat</string>
   <string name="pref_camera2_mono_preview_entry_off">Oprit</string>
@@ -439,6 +433,7 @@
   <string name="pref_camera2_mpo_entry_on">Activat</string>
   <string name="pref_camera2_mpo_entry_off">Oprit</string>
   <string name="pref_camera2_makeup_title">Machiaj</string>
+  <string name="pref_camera2_makeup_entry_off">Oprit</string>
   <string name="pref_camera2_noise_reduction_title">Reducere zgomot</string>
   <string name="pref_camera2_noise_reduction_entry_off">Oprit</string>
   <string name="pref_camera2_noise_reduction_entry_fast">Rapid</string>
@@ -447,10 +442,12 @@
   <string name="pref_camera2_videosnap_entry_enable">Activați</string>
   <string name="pref_camera2_videosnap_entry_disable">Dezactivați</string>
   <string name="pref_camera2_trackingfocus_title">Urmărire focalizare</string>
+  <string name="pref_camera2_trackingfocus_entry_off">Oprit</string>
   <string name="pref_camera_scenemode_entry_bestpicture">Cea mai bună fotografie</string>
   <string name="bestpicture_done">EFECTUAT</string>
   <string name="bestpicture_at_least_one_picture">Trebuie aleasă măcar o fotografie.</string>
   <string name="pref_camera2_shutter_sound_entry_on">Activat</string>
   <string name="pref_camera2_shutter_sound_entry_off">Oprit</string>
   <string name="pref_camera2_shutter_sound_title">Sunet obturator</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Mono</string>
 </resources>
diff --git a/res/values-ru/qcomstrings.xml b/res/values-ru/qcomstrings.xml
index 1cbf043ed..033e8fa14 100644
--- a/res/values-ru/qcomstrings.xml
+++ b/res/values-ru/qcomstrings.xml
@@ -160,7 +160,6 @@
   <string name="pref_camera_shuttersound_title" translatable="true">Звук затвора</string>
   <string name="pref_camera_shuttersound_entry_enable">Включить</string>
   <string name="pref_camera_shuttersound_entry_disable">Отключить</string>
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">Ускоренная съёмка не поддерживается при включённой стабилизации изобр., включённом HDR или в режиме замедленной съёмки.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -364,11 +363,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">HDR матрицы</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">Многокадровый HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR требует 1 кадр</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Поворот видео</string>
@@ -427,6 +421,7 @@
   <string name="pref_camera2_camera2_entry_enable">Включить</string>
   <string name="pref_camera2_camera2_entry_disable">Выключить</string>
   <string name="pref_camera2_mono_only_title">Только Моно</string>
+  <string name="pref_camera2_mono_only_entry_off">Отключить</string>
   <string name="pref_camera2_mono_preview_title">Предпросмотр Моно</string>
   <string name="pref_camera2_mono_preview_entry_on">Включено</string>
   <string name="pref_camera2_mono_preview_entry_off">Отключить</string>
@@ -438,6 +433,7 @@
   <string name="pref_camera2_mpo_entry_on">Включено</string>
   <string name="pref_camera2_mpo_entry_off">Отключить</string>
   <string name="pref_camera2_makeup_title">Макияж</string>
+  <string name="pref_camera2_makeup_entry_off">Отключить</string>
   <string name="pref_camera2_noise_reduction_title">Шумоподавление</string>
   <string name="pref_camera2_noise_reduction_entry_off">Отключить</string>
   <string name="pref_camera2_noise_reduction_entry_fast">Быстро</string>
@@ -446,10 +442,12 @@
   <string name="pref_camera2_videosnap_entry_enable">Включить</string>
   <string name="pref_camera2_videosnap_entry_disable">Выключить</string>
   <string name="pref_camera2_trackingfocus_title">Следящий автофокус</string>
+  <string name="pref_camera2_trackingfocus_entry_off">Отключить</string>
   <string name="pref_camera_scenemode_entry_bestpicture">Лучший снимок</string>
   <string name="bestpicture_done">Готово</string>
   <string name="bestpicture_at_least_one_picture">Нужно выбрать хотя бы один снимок.</string>
   <string name="pref_camera2_shutter_sound_entry_on">Вкл</string>
   <string name="pref_camera2_shutter_sound_entry_off">Отключить</string>
   <string name="pref_camera2_shutter_sound_title">Звук затвора</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Ч/Б</string>
 </resources>
diff --git a/res/values-sc-rIT/qcomstrings.xml b/res/values-sc-rIT/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-sc-rIT/qcomstrings.xml
+++ b/res/values-sc-rIT/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-si-rLK/qcomstrings.xml b/res/values-si-rLK/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-si-rLK/qcomstrings.xml
+++ b/res/values-si-rLK/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-sk/qcomstrings.xml b/res/values-sk/qcomstrings.xml
index 225d86fbc..fdaadc42b 100644
--- a/res/values-sk/qcomstrings.xml
+++ b/res/values-sk/qcomstrings.xml
@@ -160,8 +160,6 @@
   <string name="pref_camera_shuttersound_title" translatable="true">Zvuk uzávierky</string>
   <string name="pref_camera_shuttersound_entry_enable">Zapnúť</string>
   <string name="pref_camera_shuttersound_entry_disable">Vypnúť</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">Vysoká rýchlosť/pomalý pohyb nie je podporované pre DIS (optická stabilizácia obrazu) a TimeLapse (časozber)</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -365,11 +363,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">Senzor HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">Multisnímkový HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR potrebuje 1x snímku</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Otočenie videa</string>
@@ -428,6 +421,7 @@
   <string name="pref_camera2_camera2_entry_enable">Použiť</string>
   <string name="pref_camera2_camera2_entry_disable">Nepoužiť</string>
   <string name="pref_camera2_mono_only_title">Iba Mono</string>
+  <string name="pref_camera2_mono_only_entry_off">Vypnutá</string>
   <string name="pref_camera2_mono_preview_title">Náhľad Mono</string>
   <string name="pref_camera2_mono_preview_entry_on">Zapnúť</string>
   <string name="pref_camera2_mono_preview_entry_off">Vypnutá</string>
@@ -439,6 +433,7 @@
   <string name="pref_camera2_mpo_entry_on">Zapnúť</string>
   <string name="pref_camera2_mpo_entry_off">Vypnutá</string>
   <string name="pref_camera2_makeup_title">Makeup</string>
+  <string name="pref_camera2_makeup_entry_off">Vypnutá</string>
   <string name="pref_camera2_noise_reduction_title">Redukcia šumu</string>
   <string name="pref_camera2_noise_reduction_entry_off">Vypnutá</string>
   <string name="pref_camera2_noise_reduction_entry_fast">Rychlo</string>
@@ -447,10 +442,12 @@
   <string name="pref_camera2_videosnap_entry_enable">Použiť</string>
   <string name="pref_camera2_videosnap_entry_disable">Zakázať</string>
   <string name="pref_camera2_trackingfocus_title">Sledovanie zameranie</string>
+  <string name="pref_camera2_trackingfocus_entry_off">Vypnutá</string>
   <string name="pref_camera_scenemode_entry_bestpicture">Najlepší obraz</string>
   <string name="bestpicture_done">HOTOVO</string>
   <string name="bestpicture_at_least_one_picture">Aspoň jeden snímok musí byť vybraný.</string>
   <string name="pref_camera2_shutter_sound_entry_on">Zapnúť</string>
   <string name="pref_camera2_shutter_sound_entry_off">Vypnutá</string>
   <string name="pref_camera2_shutter_sound_title">Zvuk uzávierky</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Čiernobiely</string>
 </resources>
diff --git a/res/values-sl/qcomstrings.xml b/res/values-sl/qcomstrings.xml
index 2906a11bd..f89fe9be0 100644
--- a/res/values-sl/qcomstrings.xml
+++ b/res/values-sl/qcomstrings.xml
@@ -160,7 +160,6 @@
   <string name="pref_camera_shuttersound_title" translatable="true">Zvok sprožilca</string>
   <string name="pref_camera_shuttersound_entry_enable">Omogočen</string>
   <string name="pref_camera_shuttersound_entry_disable">Onemogočen</string>
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">Počasni posnetek ni podprt ob uporabi ustalitve/časovnega zamika/HDR-a.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -364,11 +363,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">Tipalo HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">Večslikovni HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR potrebuje sliko 1x</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Sukanje videoposnetka</string>
@@ -427,6 +421,7 @@
   <string name="pref_camera2_camera2_entry_enable">Omogoči</string>
   <string name="pref_camera2_camera2_entry_disable">Onemogoči</string>
   <string name="pref_camera2_mono_only_title">Samo mono</string>
+  <string name="pref_camera2_mono_only_entry_off">Izklopljeno</string>
   <string name="pref_camera2_mono_preview_title">Predogled mono</string>
   <string name="pref_camera2_mono_preview_entry_on">Vklopljeno</string>
   <string name="pref_camera2_mono_preview_entry_off">Izklopljeno</string>
@@ -438,6 +433,7 @@
   <string name="pref_camera2_mpo_entry_on">Vklopljeno</string>
   <string name="pref_camera2_mpo_entry_off">Izklopljeno</string>
   <string name="pref_camera2_makeup_title">Ličilo</string>
+  <string name="pref_camera2_makeup_entry_off">Izklopljeno</string>
   <string name="pref_camera2_noise_reduction_title">Zmanjševanje šuma</string>
   <string name="pref_camera2_noise_reduction_entry_off">Izklopljeno</string>
   <string name="pref_camera2_noise_reduction_entry_fast">Hitro</string>
@@ -446,10 +442,12 @@
   <string name="pref_camera2_videosnap_entry_enable">Omogoči</string>
   <string name="pref_camera2_videosnap_entry_disable">Onemogoči</string>
   <string name="pref_camera2_trackingfocus_title">Ostrenje s sledenjem</string>
+  <string name="pref_camera2_trackingfocus_entry_off">Izklopljeno</string>
   <string name="pref_camera_scenemode_entry_bestpicture">Najboljša slika</string>
   <string name="bestpicture_done">OPRAVLJENO</string>
   <string name="bestpicture_at_least_one_picture">Izbrana mora biti vsaj ena slika.</string>
   <string name="pref_camera2_shutter_sound_entry_on">Vklopljeno</string>
   <string name="pref_camera2_shutter_sound_entry_off">Izklopljeno</string>
   <string name="pref_camera2_shutter_sound_title">Zvok sprožilca</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Mono</string>
 </resources>
diff --git a/res/values-sq-rAL/qcomstrings.xml b/res/values-sq-rAL/qcomstrings.xml
index efd8f81bb..20429c7aa 100644
--- a/res/values-sq-rAL/qcomstrings.xml
+++ b/res/values-sq-rAL/qcomstrings.xml
@@ -125,7 +125,6 @@
   <string name="pref_camera_shuttersound_title" translatable="true">Tingulli i shkrepjes</string>
   <string name="pref_camera_shuttersound_entry_enable">E aktivizuar</string>
   <string name="pref_camera_shuttersound_entry_disable">E çaktivizuar</string>
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -263,10 +262,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Rrotullimi i videos</string>
@@ -320,6 +315,7 @@
   <string name="pref_camera2_camera2_entry_enable">Aktivizo</string>
   <string name="pref_camera2_camera2_entry_disable">Çaktivizo</string>
   <string name="pref_camera2_mono_only_title">Vetëm mono</string>
+  <string name="pref_camera2_mono_only_entry_off">Inaktiv</string>
   <string name="pref_camera2_mono_preview_title">Shikim paraprak Monokromatik</string>
   <string name="pref_camera2_mono_preview_entry_on">Aktiv</string>
   <string name="pref_camera2_mono_preview_entry_off">Inaktiv</string>
@@ -331,6 +327,7 @@
   <string name="pref_camera2_mpo_entry_on">Aktiv</string>
   <string name="pref_camera2_mpo_entry_off">Inaktiv</string>
   <string name="pref_camera2_makeup_title">Makijazhi</string>
+  <string name="pref_camera2_makeup_entry_off">Inaktiv</string>
   <string name="pref_camera2_noise_reduction_title">Reduktimi i zhurmave</string>
   <string name="pref_camera2_noise_reduction_entry_off">Inaktiv</string>
   <string name="pref_camera2_noise_reduction_entry_fast">I shpejtë</string>
@@ -339,10 +336,12 @@
   <string name="pref_camera2_videosnap_entry_enable">Aktivizo</string>
   <string name="pref_camera2_videosnap_entry_disable">Çaktivizo</string>
   <string name="pref_camera2_trackingfocus_title">Ndjekja e fokusit</string>
+  <string name="pref_camera2_trackingfocus_entry_off">Inaktiv</string>
   <string name="pref_camera_scenemode_entry_bestpicture">Fotoja më e mirë</string>
   <string name="bestpicture_done">U KRYE</string>
   <string name="bestpicture_at_least_one_picture">Duhet zgjedhur të paktën një foto.</string>
   <string name="pref_camera2_shutter_sound_entry_on">Aktiv</string>
   <string name="pref_camera2_shutter_sound_entry_off">Inaktiv</string>
   <string name="pref_camera2_shutter_sound_title">Tingulli i shkrepjes</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Mono</string>
 </resources>
diff --git a/res/values-sr-rCS/qcomstrings.xml b/res/values-sr-rCS/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-sr-rCS/qcomstrings.xml
+++ b/res/values-sr-rCS/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-sr/qcomstrings.xml b/res/values-sr/qcomstrings.xml
index a21b846c4..3aa06b033 100644
--- a/res/values-sr/qcomstrings.xml
+++ b/res/values-sr/qcomstrings.xml
@@ -160,7 +160,6 @@
   <string name="pref_camera_shuttersound_title" translatable="true">Звук затварача</string>
   <string name="pref_camera_shuttersound_entry_enable">Омогућено</string>
   <string name="pref_camera_shuttersound_entry_disable">Онемогућено</string>
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">Убрзано снимање није подржано док је укључена стабилизација, успорено снимање или HDR.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -364,11 +363,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">HDR сензор</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">HDR са више кадрова</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR треба 1 кадар</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Ротација видеа</string>
@@ -427,6 +421,7 @@
   <string name="pref_camera2_camera2_entry_enable">Омогући</string>
   <string name="pref_camera2_camera2_entry_disable">Онемогући</string>
   <string name="pref_camera2_mono_only_title">Само монохроматски</string>
+  <string name="pref_camera2_mono_only_entry_off">Искључено</string>
   <string name="pref_camera2_mono_preview_title">Монохроматски преглед</string>
   <string name="pref_camera2_mono_preview_entry_on">Укључено</string>
   <string name="pref_camera2_mono_preview_entry_off">Искључено</string>
@@ -438,6 +433,7 @@
   <string name="pref_camera2_mpo_entry_on">Укључено</string>
   <string name="pref_camera2_mpo_entry_off">Искључено</string>
   <string name="pref_camera2_makeup_title">Шминка</string>
+  <string name="pref_camera2_makeup_entry_off">Искључено</string>
   <string name="pref_camera2_noise_reduction_title">Смањивање шума</string>
   <string name="pref_camera2_noise_reduction_entry_off">Искључено</string>
   <string name="pref_camera2_noise_reduction_entry_fast">Брзо</string>
@@ -446,10 +442,12 @@
   <string name="pref_camera2_videosnap_entry_enable">Омогући</string>
   <string name="pref_camera2_videosnap_entry_disable">Онемогући</string>
   <string name="pref_camera2_trackingfocus_title">Пратећи фокус</string>
+  <string name="pref_camera2_trackingfocus_entry_off">Искључено</string>
   <string name="pref_camera_scenemode_entry_bestpicture">Најбоља слика</string>
   <string name="bestpicture_done">ГОТОВО</string>
   <string name="bestpicture_at_least_one_picture">Мора бити изабрана бар једна слика.</string>
   <string name="pref_camera2_shutter_sound_entry_on">Укључено</string>
   <string name="pref_camera2_shutter_sound_entry_off">Искључено</string>
   <string name="pref_camera2_shutter_sound_title">Звук затварача</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Моно</string>
 </resources>
diff --git a/res/values-sv/qcomstrings.xml b/res/values-sv/qcomstrings.xml
index bab0a3ab2..69534da87 100644
--- a/res/values-sv/qcomstrings.xml
+++ b/res/values-sv/qcomstrings.xml
@@ -151,7 +151,6 @@
   <string name="pref_camera_selfiemirror_entry_disable">Avaktivera</string>
   <string name="pref_camera_shuttersound_entry_enable">Aktiverad</string>
   <string name="pref_camera_shuttersound_entry_disable">Avaktiverad</string>
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">Höghastighetsinspelning stöds inte när du använder stabilisering/intervallinspelning/HDR.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -347,11 +346,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">Sensor HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">Flerbilds-HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR behöver 1 x bild</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Videorotation</string>
@@ -391,21 +385,25 @@
   <string name="pref_camera2_camera2_entry_enable">Aktivera</string>
   <string name="pref_camera2_camera2_entry_disable">Avaktivera</string>
   <string name="pref_camera2_mono_only_title">Endast mono</string>
+  <string name="pref_camera2_mono_only_entry_off">Av</string>
   <string name="pref_camera2_mono_preview_entry_on">På</string>
   <string name="pref_camera2_mono_preview_entry_off">Av</string>
   <string name="pref_camera2_clearsight_entry_on">På</string>
   <string name="pref_camera2_clearsight_entry_off">Av</string>
   <string name="pref_camera2_mpo_entry_on">På</string>
   <string name="pref_camera2_mpo_entry_off">Av</string>
+  <string name="pref_camera2_makeup_entry_off">Av</string>
   <string name="pref_camera2_noise_reduction_title">Brusreducering</string>
   <string name="pref_camera2_noise_reduction_entry_off">Av</string>
   <string name="pref_camera2_noise_reduction_entry_fast">Snabb</string>
   <string name="pref_camera2_noise_reduction_entry_high_quality">Hög kvalite</string>
   <string name="pref_camera2_videosnap_entry_enable">Aktivera</string>
   <string name="pref_camera2_videosnap_entry_disable">Avaktivera</string>
+  <string name="pref_camera2_trackingfocus_entry_off">Av</string>
   <string name="pref_camera_scenemode_entry_bestpicture">Bästa bild</string>
   <string name="bestpicture_done">KLAR</string>
   <string name="bestpicture_at_least_one_picture">Minst en bild måste väljas.</string>
   <string name="pref_camera2_shutter_sound_entry_on">På</string>
   <string name="pref_camera2_shutter_sound_entry_off">Av</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Mono</string>
 </resources>
diff --git a/res/values-sw/qcomstrings.xml b/res/values-sw/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-sw/qcomstrings.xml
+++ b/res/values-sw/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-ta-rIN/qcomstrings.xml b/res/values-ta-rIN/qcomstrings.xml
index 28478946f..94b0019ea 100644
--- a/res/values-ta-rIN/qcomstrings.xml
+++ b/res/values-ta-rIN/qcomstrings.xml
@@ -131,7 +131,6 @@
   <!-- Settings screen, Select Redeye Reduction -->
   <string name="pref_camera_redeyereduction_title">சிவப்பு கண் குறைப்பு</string>
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">நிலைப்படுத்தல்/நேர தாமதம்/HDR பயன்படுத்தும்போது உயர்-சட்டவிகித பதிவுசெய்தல் ஆதரிக்கப்படுவதில்லை.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -310,11 +309,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">உணர்கருவி HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">பல சட்ட HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDRக்கு 1x frame தேவை</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">வீடியோ சுழற்சி</string>
@@ -336,9 +330,13 @@
   <string name="all_in_focus">அனைத்தும் குவியத்தில்</string>
   <string name="refocus_toast">கடந்தை புகைப்படத்தை மறு-குவியம் செய்ய, இங்கே தட்டு</string>
   <!-- Help menu strings -->
+  <string name="pref_camera2_mono_only_entry_off">முடக்கத்தில்</string>
   <string name="pref_camera2_mono_preview_entry_off">முடக்கத்தில்</string>
   <string name="pref_camera2_clearsight_entry_off">முடக்கத்தில்</string>
   <string name="pref_camera2_mpo_entry_off">முடக்கத்தில்</string>
+  <string name="pref_camera2_makeup_entry_off">முடக்கத்தில்</string>
   <string name="pref_camera2_noise_reduction_entry_off">முடக்கத்தில்</string>
+  <string name="pref_camera2_trackingfocus_entry_off">முடக்கத்தில்</string>
   <string name="pref_camera2_shutter_sound_entry_off">முடக்கத்தில்</string>
+  <string name="pref_camera2_initial_camera_entry_mono">மோனோ</string>
 </resources>
diff --git a/res/values-te-rIN/qcomstrings.xml b/res/values-te-rIN/qcomstrings.xml
index a715eb62c..3f023753e 100644
--- a/res/values-te-rIN/qcomstrings.xml
+++ b/res/values-te-rIN/qcomstrings.xml
@@ -131,7 +131,6 @@
   <!-- Settings screen, Select Redeye Reduction -->
   <string name="pref_camera_redeyereduction_title">ఎరుపు నేత్ర తగ్గింపు</string>
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">స్థిరీకరణ/టైం లాప్స్/HDR ఉపయోగిస్తున్నప్పుడు హై-ఫ్రేంరేట్ రికార్డింగ్ కు మద్దతు లేదు</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -310,11 +309,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">సెన్సర్ HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">మల్టి-ఫ్రేం HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR కు 1x  ఫ్రేం అవసరం</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">వీడియో పరిభ్రమణం</string>
@@ -336,9 +330,13 @@
   <string name="all_in_focus">అన్నీ ఫోకస్ లో ఉన్నాయి</string>
   <string name="refocus_toast">చివరి ఫోటోను రీ-ఫోకస్ చేయడానికి, ఇక్కడ ట్యాప్ చేయండి</string>
   <!-- Help menu strings -->
+  <string name="pref_camera2_mono_only_entry_off">ఆఫ్‌లో ఉంది</string>
   <string name="pref_camera2_mono_preview_entry_off">ఆఫ్‌లో ఉంది</string>
   <string name="pref_camera2_clearsight_entry_off">ఆఫ్‌లో ఉంది</string>
   <string name="pref_camera2_mpo_entry_off">ఆఫ్‌లో ఉంది</string>
+  <string name="pref_camera2_makeup_entry_off">ఆఫ్‌లో ఉంది</string>
   <string name="pref_camera2_noise_reduction_entry_off">ఆఫ్‌లో ఉంది</string>
+  <string name="pref_camera2_trackingfocus_entry_off">ఆఫ్‌లో ఉంది</string>
   <string name="pref_camera2_shutter_sound_entry_off">ఆఫ్‌లో ఉంది</string>
+  <string name="pref_camera2_initial_camera_entry_mono">మోనో</string>
 </resources>
diff --git a/res/values-th/qcomstrings.xml b/res/values-th/qcomstrings.xml
index ebcaed4f0..372017a25 100644
--- a/res/values-th/qcomstrings.xml
+++ b/res/values-th/qcomstrings.xml
@@ -131,7 +131,6 @@
   <!-- Settings screen, Select Redeye Reduction -->
   <string name="pref_camera_redeyereduction_title">ลดตาแดง</string>
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">ไม่สามารถใช้งานการเคลื่อนไหวแบบความเร็วสูง/การเคลื่อนไหวแบบช้า สำหรับ DIS และ TimeLapse</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -310,11 +309,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">HDR เซนเซอร์</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">HDR แบบหลายเฟรม</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR ต้องใช้ 1x เฟรม</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">การหมุนสลับวิดีโอ</string>
@@ -336,9 +330,13 @@
   <string name="all_in_focus">โฟกัสทุกตำแหน่ง</string>
   <string name="refocus_toast">ในการโฟกัสภาพล่าสุดใหม่ แตะที่นี่</string>
   <!-- Help menu strings -->
+  <string name="pref_camera2_mono_only_entry_off">ปิด</string>
   <string name="pref_camera2_mono_preview_entry_off">ปิด</string>
   <string name="pref_camera2_clearsight_entry_off">ปิด</string>
   <string name="pref_camera2_mpo_entry_off">ปิด</string>
+  <string name="pref_camera2_makeup_entry_off">ปิด</string>
   <string name="pref_camera2_noise_reduction_entry_off">ปิด</string>
+  <string name="pref_camera2_trackingfocus_entry_off">ปิด</string>
   <string name="pref_camera2_shutter_sound_entry_off">ปิด</string>
+  <string name="pref_camera2_initial_camera_entry_mono">โมโน</string>
 </resources>
diff --git a/res/values-tl/cm_strings.xml b/res/values-tl/cm_strings.xml
new file mode 100644
index 000000000..ebca1dc44
--- /dev/null
+++ b/res/values-tl/cm_strings.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2013-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- common aspect ratios -->
+  <!-- aspect ratio greater than 16:9, so "widescreen" or "cinematic" -->
+  <!-- format for entries in the picture size menu. Parameter one is aspect ratio
+         parameter two is size in megapixels, e.g. "(4:3) 12.1 megapixels"
+         NOTE: for Chinese (zh) and Korean (ko) the pixel number (parameter two)
+         will be multiplied by 100 as those languages want to count by ten thousands -->
+  <!-- Settings screen, scene mode -->
+  <!-- Settings screen, focus mode -->
+  <!-- Color effects -->
+  <!-- Red eye flash mode title -->
+  <!-- Power shutter -->
+  <!-- Max brightness -->
+  <!-- Touch focus duration -->
+  <!-- Shutter speed -->
+  <!-- Advanced options -->
+</resources>
diff --git a/res/values-tl/qcomstrings.xml b/res/values-tl/qcomstrings.xml
new file mode 100644
index 000000000..5dc8931ef
--- /dev/null
+++ b/res/values-tl/qcomstrings.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+    Copyright (c) 2012-2014, 2016, The Linux Foundation. All rights reserved.
+
+    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.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<resources>
+  <!-- Video quality setting entry. Videos will be recorded in VGA quality. [CHAR LIMIT=24] -->
+  <!-- Video quality setting entry. Videos will be recorded in CIF quality. [CHAR LIMIT=24] -->
+  <!-- Video quality setting entry. Videos will be recorded in QVGA quality. [CHAR LIMIT=24] -->
+  <!-- Video quality setting entry. Videos will be recorded in QCIF quality. [CHAR LIMIT=24] -->
+  <!-- Settings screen, Power Mode title -->
+  <!-- Settings screen, Power mode dialog radio button choices -->
+  <!-- Settings screen, Power mode dialog radio button choices -->
+  <!-- Default Power mode.. -->
+  <!-- Default auto exposure setting. Do not translate. -->
+  <!-- Settings screen, Select auto exposure title -->
+  <!-- Settings screen, auto exposure dialog radio button choices -->
+  <!-- Auto exposure entry values. Do not translate. -->
+  <!-- Settings screen, Video encoder title -->
+  <!-- Settings screen, Video encoder dialog radio button choices -->
+  <!-- Default video encoder setting. A numerical value. -->
+  <!-- Settings screen, Video encoder dialog title -->
+  <!-- Default audio encoder setting. A numerical value. -->
+  <!-- Settings screen, Audio encoder title -->
+  <!-- Settings screen, Audio encoder dialog radio button choices -->
+  <!-- Default video duration setting. A numerical value.-->
+  <!-- Default Skin Tone Enhancement setting. Do not translate. -->
+  <!-- Settings screen, Select Skin Tone Enhancement title -->
+  <!-- Settings screen, Skin Tone Enhancement radio button choices -->
+  <!-- Skin Tone Enhancement entry values. Do not translate. -->
+  <!-- Settings screen, setting title text for ZSL-->
+  <!-- Default selectable zone af setting. Do not translate. -->
+  <!-- Settings screen, Selectable zone af title -->
+  <!-- Settings screen, Selectable Zone Af dialog radio button choices -->
+  <!-- Auto exposure entry values. Do not translate. -->
+  <!-- Settings screen, Selectable advanced features title -->
+  <!-- Settings screen, Selectable Zone Af dialog radio button choices -->
+  <!-- Auto exposure entry values. Do not translate. -->
+  <!-- Manual exposure control entry values -->
+  <!-- Manual white balance entry values -->
+  <!-- Manual Focus entry values -->
+  <!-- Instant Capture entry -->
+  <!-- Instant Capture entry values -->
+  <!-- Settings screen, ZSL location dialog choices -->
+  <!-- The message is shown in toast when HDR or scene mode is enabled -->
+  <!-- Settings screen, Video HDR location dialog choices -->
+  <!-- Settings screen, CDS location dialog choices -->
+  <!-- Settings screen, video CDS location dialog choices -->
+  <!-- Settings screen, TNR location dialog choices -->
+  <!-- Settings screen, TNR location dialog choices -->
+  <!-- Settings screen, video TNR location dialog choices -->
+  <!-- Settings screen, video TNR location dialog choices -->
+  <!-- Settings screen, setting title text for Video HDR-->
+  <!-- Settings menu, setting title text for cds mode-->
+  <!-- Settings menu, setting title text for video cds mode-->
+  <!-- Default cds mode setting-->
+  <!-- Default video cds mode setting-->
+  <!-- Settings menu, setting title text for tnr mode-->
+  <!-- Settings menu, setting title text for video tnr mode-->
+  <!-- Default tnr mode setting-->
+  <!-- Default video tnr mode setting-->
+  <!-- Default face  detection setting. -->
+  <!-- Settings screen, Select Face Detection -->
+  <!-- Settings menu, Face Detection choices -->
+  <!-- Default Selfie Flash setting. -->
+  <!-- Settings screen, Selfie Flash Detection -->
+  <!-- Settings menu, Selfie Flash choices -->
+  <!-- Default redeye reduction setting. -->
+  <!-- Settings screen, Select Redeye Reduction -->
+  <!-- Settings menu, redeye reduction choices -->
+  <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
+  <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
+  <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
+  <!-- The message is shown in dialog when the app encounters an unsupported resolution for HSR mode -->
+  <!-- The message is shown in dialog when the app encounters an unsupported video codec for HFR mode -->
+  <!-- The message is shown in dialog when the app encounters an unsupported video resolution-->
+  <!-- The message is shown in dialog when the app encounters an unsupported video profile-->
+  <!--The message is shown in dialog when the raw snapshot is selected in zsl mode-->
+  <!-- Settings screen, AE bracketing and HDR location dialog choices -->
+  <!-- The messsage shown if user selects a snapshot resolution lower than the current video size. -->
+  <!-- The messsage shown if user selects a snapshot resolution in low power mode. -->
+  <!-- The messsage shown if user tries to take snapshot during D1/QCIF resolution. -->
+  <!-- Default hfr setting. Do not translate. -->
+  <!-- Settings screen, Select hfr title -->
+  <!-- Settings screen, hfr radio button choices -->
+  <!-- HFR entry values. Do not translate. -->
+  <!-- Default noise reduction setting. Do not translate. -->
+  <!-- Settings screen, Select See More title -->
+  <!-- Settings screen, see more radio button choices -->
+  <!-- see more entry values. Do not translate. -->
+  <!-- Default see more setting. Do not translate. -->
+  <!-- Settings screen, Select See More title -->
+  <!-- Settings screen, see more radio button choices -->
+  <!-- see more entry values. Do not translate. -->
+  <!-- Denoise Settings screen, setting title text -->
+  <!-- Denoise Settings screen, Record location dialog choices -->
+  <!-- Default iso setting. Do not translate. -->
+  <!-- Settings screen, Select Iso title -->
+  <!-- Settings screen, ISO dialog radio button choices -->
+  <!-- ISO entry values. Do not translate. -->
+  <!-- Settings screen, Anti Banding title -->
+  <!-- Default Anti Banding setting. -->
+  <!-- Settings screen, Anti Banding entries -->
+  <!-- Default color effect setting. -->
+  <!-- Settings screen, Select Color effect title -->
+  <!-- Settings screen, Color effect dialog radio button choices -->
+  <!-- Color effect that overexposes and reverses some of the tones. -->
+  <!-- Settings screen, Touch AF/AEC dialog radio button choices -->
+  <!-- Select IS title -->
+  <!-- DIS choices -->
+  <!-- Select Face Recognition title -->
+  <!-- Face Recognition choices -->
+  <!-- Settings screen, Multiple levels entries -->
+  <!-- Settings screen, Multiple levels entries -->
+  <!-- Settings screen, Multiple levels entries -->
+  <!-- Default sharpness setting. Do not translate. -->
+  <!-- Settings screen, Select sharpness title -->
+  <!-- Default contrast setting. Do not translate. -->
+  <!-- Settings screen, Select contrast title -->
+  <!-- Default saturation setting. Do not translate. -->
+  <!-- Settings screen, Select saturation title -->
+  <!-- Default picture quality setting. See pref_camera_jpegquality_entryvalues for possible values -->
+  <!-- Default Picture format setting. Do not translate. -->
+  <!-- Settings screen, Select Picture format title -->
+  <!-- Settings screen, picture format dialog radio button choices -->
+  <!-- Picture format entry values. Do not translate. -->
+  <!-- Settings screen, Picture quality title -->
+  <!-- Settings screen, Picture quality dialog radio button choices -->
+  <!-- Default auto histogram setting. Do not translate. -->
+  <!-- Settings screen, Select Histogram title -->
+  <!-- Settings screen, Histogram radio button choices -->
+  <!-- Histogram entry values. Do not translate. -->
+  <!-- Default auto scene detection setting. -->
+  <!-- Settings screen, Select Auto Scene Detection -->
+  <!-- Settings menu, auto scene detection choices -->
+  <!-- Scene detection set to on - supports backlight and snow cloudy detection. -->
+  <!-- Toast showing error if invalid size selected for  time lapse  [CHAR LIMIT=65] -->
+  <!-- longshot value -->
+  <!-- Toast showing non-supported functionality for flash in AE bracket -->
+  <!-- Settings screen, setting title text for Auto HDR-->
+  <!-- Settings screen, Auto HDR location dialog choices -->
+  <!-- toast message for storage location switch -->
+  <!-- Settings screen, Selectable HDR mode title -->
+  <!-- Settings screen, Selectable HDR mode radio button choices -->
+  <!-- HDR mode entry values. Do not translate. -->
+  <!--Default video rotation setting-->
+  <!--Settings screen, video rotation title-->
+  <!--Menu, video rotation label-->
+  <!-- Settings screen, Video rotation dialog radio button choices -->
+  <!-- The message is shown in toast when click showOnMap Menu and there is no map app -->
+  <!-- Continuous shot enable message -->
+  <!-- Advanced features enable message -->
+  <!-- The alas of CameraActivity for gesture operation -->
+  <!-- Help menu strings -->
+</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 5ef715552..e25adc394 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2007 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,282 +13,274 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="1175086483881127797">"Camera"</string>
-    <string name="video_camera_label" msgid="1723708322021743770">"Camcorder"</string>
-    <string name="details_ms" msgid="6618163484662724641">"%1$02d:%2$02d"</string>
-    <string name="details_hms" msgid="4842276230698703554">"%1$d:%2$02d:%3$02d"</string>
-    <string name="set_image" msgid="3969690281401045698">"Itakda ang larawan bilang"</string>
-    <string name="delete" msgid="2714492172818940424">"Tanggalin"</string>
-  <plurals name="delete_selection">
-    <item quantity="one" msgid="8811352590292754044">"Tanggalin ang napiling item?"</item>
-    <item quantity="other" msgid="5075283252850066610">"Tanggalin ang mga napiling item?"</item>
-  </plurals>
-    <string name="share" msgid="8581089487762243115">"Ibahagi"</string>
-    <string name="share_panorama" msgid="3558466186935359444">"Ibahagi ang panorama"</string>
-    <string name="share_as_photo" msgid="4831213580709167218">"Ibahagi bilang larawan"</string>
-    <string name="deleted" msgid="2036165115527228127">"Tinanggal"</string>
-    <string name="undo" msgid="5110048345890050107">"I-UNDO"</string>
-    <string name="details" msgid="4404020741542549488">"Mga detalye"</string>
-    <string name="close" msgid="4826166926297479820">"Isara"</string>
-  <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="9217673864242686656">"%1$d ang napili"</item>
-    <item quantity="one" msgid="5806616411905812727">"%1$d ang napili"</item>
-    <item quantity="other" msgid="3767743589502328221">"%1$d ang napili"</item>
-  </plurals>
-  <plurals name="number_of_albums_selected">
-    <item quantity="zero" msgid="8095100906728830821">"%1$d ang napili"</item>
-    <item quantity="one" msgid="9063509704521984072">"%1$d ang napili"</item>
-    <item quantity="other" msgid="135044054552480485">"%1$d ang napili"</item>
-  </plurals>
-  <plurals name="number_of_groups_selected">
-    <item quantity="zero" msgid="1942343672734097509">"%1$d ang napili"</item>
-    <item quantity="one" msgid="1456436514367094505">"%1$d ang napili"</item>
-    <item quantity="other" msgid="1511467088339194694">"%1$d ang napili"</item>
-  </plurals>
-    <string name="show_on_map" msgid="8542853913632649160">"Ipakita sa mapa"</string>
-    <string name="rotate_left" msgid="2618440058490662604">"I-rotate pakaliwa"</string>
-    <string name="rotate_right" msgid="4896096424267838355">"I-rotate pakanan"</string>
-    <string name="edit" msgid="2776879395749004347">"I-edit"</string>
-    <string name="crop_action" msgid="6933589718464132714">"I-crop"</string>
-    <string name="trim_action" msgid="4736803320203951827">"I-trim"</string>
-    <string name="set_as" msgid="5469055085024870081">"Itakda bilang"</string>
-    <string name="video_err" msgid="1562566029875081552">"Hindi ma-play ang video."</string>
-    <string name="crop_saved" msgid="4465794038855602739">"Na-save ang na-crop na larawan sa <xliff:g id="FOLDER_NAME">%s</xliff:g>."</string>
-    <string name="title" msgid="8061744305671964703">"Pamagat"</string>
-    <string name="description" msgid="8193138501982849808">"Paglalarawan"</string>
-    <string name="time" msgid="5248213506417024287">"Oras"</string>
-    <string name="location" msgid="564326205780827668">"Lokasyon"</string>
-    <string name="path" msgid="5927003361865586353">"Path"</string>
-    <string name="width" msgid="7045750687833828758">"Lapad"</string>
-    <string name="height" msgid="5186001199353423689">"Taas"</string>
-    <string name="orientation" msgid="3883761294106680270">"Oryentasyon"</string>
-    <string name="duration" msgid="5316211067383665008">"Tagal"</string>
-    <string name="mimetype" msgid="6415940055077963944">"Uri ng MIME"</string>
-    <string name="file_size" msgid="6841070748357980676">"Laki ng file"</string>
-    <string name="maker" msgid="698691509121545856">"Maker"</string>
-    <string name="model" msgid="8547493604023069452">"Modelo"</string>
-    <string name="flash" msgid="995041910749174196">"Flash"</string>
-    <string name="aperture" msgid="2453802098282814022">"Aperture"</string>
-    <string name="focal_length" msgid="8351221512187346229">"Focal Length"</string>
-    <string name="white_balance" msgid="1600142743496129085">"White balance"</string>
-    <string name="exposure_time" msgid="949787291620767754">"Exposure time"</string>
-    <string name="iso" msgid="8578773821062054902">"ISO"</string>
-    <string name="unit_mm" msgid="5210344300697638286">"mm"</string>
-    <string name="manual" msgid="2444400953521760140">"Manual"</string>
-    <string name="auto" msgid="2552649885114400474">"Auto"</string>
-    <string name="flash_on" msgid="6573457197393807642">"Flash fired"</string>
-    <string name="flash_off" msgid="7889323512830926273">"Walang flash"</string>
-    <string name="unknown" msgid="564184550182858146">"Unknown"</string>
-    <string name="try_to_set_local_album_available_offline" msgid="3363125545009254117">"Lokal na naka-store ang item na ito at available offline."</string>
-    <string name="please_wait" msgid="1416313324505140068">"Mangyaring maghintay"</string>
-    <string name="rendering_photo_sphere" msgid="3032858512989313215">"Nire-render ang photo sphere"</string>
-    <string name="camera_error_title" msgid="6200558085072670067">"Error sa camera"</string>
-    <string name="cannot_connect_camera" msgid="4311259792784598381">"Hindi makakonekta sa camera."</string>
-    <string name="camera_disabled" msgid="6963443549010040595">"Na-disable ang camera dahil sa mga patakaran sa seguridad."</string>
-    <string name="wait" msgid="765601745709933047">"Mangyaring maghintay…"</string>
-    <string name="no_storage" product="default" msgid="5922012950780548098">"Magpasok ng SD card bago gamitin ang camera."</string>
-    <string name="preparing_sd" product="default" msgid="7435693655017362767">"Ihinahanda ang SD card..."</string>
-    <string name="access_sd_fail" product="default" msgid="2634861611082499811">"Hindi ma-access ang SD card."</string>
-    <string name="time_lapse_title" msgid="3267978566401228497">"Pag-record ng time lapse"</string>
-    <string name="capturing" msgid="5255164204641920893">"Kinukunan"</string>
-    <string name="pref_camera_id_title" msgid="4680648115225411185">"Pumili ng camera"</string>
-    <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Bumalik"</string>
-    <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Harap"</string>
-    <string name="pref_camera_recordlocation_title" msgid="3354956161456185749">"I-store ang lokasyon"</string>
-    <string name="pref_camera_location_label" msgid="8695441802378057719">"LOKASYON"</string>
-    <string name="pref_camera_timer_title" msgid="4728838281741571323">"Timer ng countdown"</string>
-  <plurals name="pref_camera_timer_entry">
-    <item quantity="one" msgid="8919878087230098328">"1 segundo"</item>
-    <item quantity="other" msgid="5782794798884172289">"%d (na) segundo"</item>
-  </plurals>
-    <!-- no translation found for pref_camera_timer_sound_default (6225207881203007747) -->
-    <skip />
-    <string name="pref_camera_timer_sound_title" msgid="9036987234878551217">"Beep sa pag-countdown"</string>
-    <string name="setting_off" msgid="6782191065550276632">"Naka-off"</string>
-    <string name="setting_on" msgid="9086728135773197891">"Naka-on"</string>
-    <string name="pref_video_quality_title" msgid="5887153490982738588">"Kalidad ng video"</string>
-    <string name="pref_video_time_lapse_frame_interval_title" msgid="4975260837607993569">"Time lapse"</string>
-    <string name="pref_camera_settings_category" msgid="4274141528139077830">"Mga setting ng camera"</string>
-    <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Mga setting ng camcorder"</string>
-    <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Laki ng larawan"</string>
-    <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13M pixel"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8M pixel"</string>
-    <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5M pixel"</string>
-    <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4M pixels (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3M pixel"</string>
-    <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2M pixel"</string>
-    <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2M pixel (16:9)"</string>
-    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1.5M pixel"</string>
-    <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1.3M pixel"</string>
-    <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1M pixel"</string>
-    <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
-    <string name="pref_camera_picturesize_entry_qvga" msgid="6134562622041084167">"QVGA"</string>
-    <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Focus mode"</string>
-    <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Auto"</string>
-    <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Infinity"</string>
-    <string name="pref_camera_focusmode_entry_macro" msgid="7632276686726851426">"Macro"</string>
-    <string name="pref_camera_focusmode_label_auto" msgid="4884418453600317694">"AUTO"</string>
-    <string name="pref_camera_focusmode_label_infinity" msgid="1673352016120343314">"INFINITY"</string>
-    <string name="pref_camera_focusmode_label_macro" msgid="5065639298027996399">"MACRO"</string>
-    <string name="pref_camera_flashmode_title" msgid="8363803841022314574">"Flash mode"</string>
-    <string name="pref_camera_flashmode_label" msgid="5852483713534762800">"FLASH MODE"</string>
-    <string name="pref_camera_flashmode_entry_auto" msgid="4211992591841657014">"Auto"</string>
-    <string name="pref_camera_flashmode_entry_on" msgid="3519831202665377698">"Naka-on"</string>
-    <string name="pref_camera_flashmode_entry_off" msgid="8861322265566617357">"Naka-off"</string>
-    <string name="pref_camera_flashmode_label_auto" msgid="2309144918900450379">"FLASH AUTO"</string>
-    <string name="pref_camera_flashmode_label_on" msgid="373595517770024934">"NAKA-ON ANG FLASH"</string>
-    <string name="pref_camera_flashmode_label_off" msgid="7175863901446001441">"NAKA-OFF ANG FLASH"</string>
-    <string name="pref_camera_whitebalance_title" msgid="7962809566612868179">"White balance"</string>
-    <string name="pref_camera_whitebalance_label" msgid="7370366644738746700">"WHITE BALANCE"</string>
-    <string name="pref_camera_whitebalance_entry_auto" msgid="1390631794449502796">"Auto"</string>
-    <string name="pref_camera_whitebalance_entry_incandescent" msgid="1140391575294372706">"Incandescent"</string>
-    <string name="pref_camera_whitebalance_entry_daylight" msgid="757833578153467254">"Daylight"</string>
-    <string name="pref_camera_whitebalance_entry_fluorescent" msgid="5157027611220790970">"Fluorescent"</string>
-    <string name="pref_camera_whitebalance_entry_cloudy" msgid="3569589102226796875">"Maulap"</string>
-    <string name="pref_camera_whitebalance_label_auto" msgid="4305837287360485369">"AUTO"</string>
-    <string name="pref_camera_whitebalance_label_incandescent" msgid="2860805668879945185">"INCANDESCENT"</string>
-    <string name="pref_camera_whitebalance_label_daylight" msgid="4562002095198912409">"DAYLIGHT"</string>
-    <string name="pref_camera_whitebalance_label_fluorescent" msgid="10552295745391742">"FLUORESCENT"</string>
-    <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"MAULAP"</string>
-    <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Scene mode"</string>
-    <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Auto"</string>
-    <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
-    <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"NAKA-ON ANG HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"NAKA-OFF ANG HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"NAKA-ON ANG HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"NAKA-OFF ANG HDR"</string>
-    <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Aksyon"</string>
-    <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Gabi"</string>
-    <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Takipsilim"</string>
-    <string name="pref_camera_scenemode_entry_party" msgid="401232668169066415">"Party"</string>
-    <string name="pref_camera_scenemode_label_auto" msgid="2874586883608401615">"WALA"</string>
-    <string name="pref_camera_scenemode_label_action" msgid="1822814017595414923">"AKSYON"</string>
-    <string name="pref_camera_scenemode_label_night" msgid="7764371228088101131">"GABI"</string>
-    <string name="pref_camera_scenemode_label_sunset" msgid="3443610538453611123">"TAKIPSILIM"</string>
-    <string name="pref_camera_scenemode_label_party" msgid="917499272505930322">"PARTY"</string>
-    <string name="pref_camera_countdown_label_off" msgid="3986433580620011481">"NAKA-OFF ANG TIMER"</string>
-    <string name="pref_camera_countdown_label_one" msgid="7647972711796868848">"1 SEGUNDO"</string>
-    <string name="pref_camera_countdown_label_three" msgid="3154170918067103541">"3 SEGUNDO"</string>
-    <string name="pref_camera_countdown_label_ten" msgid="4372650985906500604">"10 SEGUNDO"</string>
-    <string name="pref_camera_countdown_label_fifteen" msgid="8469955900530268867">"15 SEGUNDO"</string>
-    <string name="not_selectable_in_scene_mode" msgid="3260801086980522611">"Hindi mapipili sa scene mode."</string>
-    <string name="pref_exposure_title" msgid="7525751789152582800">"Exposure"</string>
-    <string name="pref_exposure_label" msgid="2604738602400261218">"EXPOSURE"</string>
-    <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
-    <skip />
-    <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
-    <skip />
-    <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
-    <string name="pref_camera_id_label_back" msgid="1645608049757733858">"CAMERA SA HARAP"</string>
-    <string name="pref_camera_id_label_front" msgid="349308803062874842">"CAMERA SA LIKOD"</string>
-    <string name="dialog_ok" msgid="774141340500181131">"OK"</string>
-    <string name="spaceIsLow_content" product="default" msgid="4522771065344332702">"Nauubusan na ng espasyo ang SD card. Baguhin ang setting ng kalidad o tanggalin ang ilan sa mga larawan o ibang mga file."</string>
-    <string name="video_reach_size_limit" msgid="9196836111505731836">"Naabot ang limitasyon ng laki."</string>
-    <string name="pano_too_fast_prompt" msgid="2503148095578052177">"Masyadong mabilis"</string>
-    <string name="pano_dialog_prepare_preview" msgid="4445235163599534263">"Ihinahanda ang panorama"</string>
-    <string name="pano_dialog_panorama_failed" msgid="6772546547048693619">"Hindi ma-save ang panorama."</string>
-    <string name="pano_dialog_title" msgid="6662642763395425145">"Panorama"</string>
-    <string name="pano_capture_indication" msgid="4002128831255023954">"Kinukunan ang panorama"</string>
-    <string name="pano_dialog_waiting_previous" msgid="2646847402743245320">"Hinihintay ang nakaraang panorama"</string>
-    <string name="pano_review_saving_indication_str" msgid="4691771283450663293">"Nagse-save..."</string>
-    <string name="pano_review_rendering" msgid="2743087719999377155">"Nire-render ang panorama"</string>
-    <string name="tap_to_focus" msgid="3519718196270593468">"Pindutin upang mag-focus."</string>
-    <string name="pref_video_effect_title" msgid="594570613431209010">"Effects"</string>
-    <string name="effect_none" msgid="3102797925086872636">"Wala"</string>
-    <string name="effect_goofy_face_squeeze" msgid="1362021544829311452">"I-squeeze"</string>
-    <string name="effect_goofy_face_big_eyes" msgid="9220121522816762649">"Malalaking mata"</string>
-    <string name="effect_goofy_face_big_mouth" msgid="2064008284599552683">"Malaking bibig"</string>
-    <string name="effect_goofy_face_small_mouth" msgid="3105849596912069261">"Maliit na bibig"</string>
-    <string name="effect_goofy_face_big_nose" msgid="6936976307035428164">"Malaking ilong"</string>
-    <string name="effect_goofy_face_small_eyes" msgid="558042211252573238">"Maliliit na mata"</string>
-    <string name="effect_backdropper_space" msgid="9133825395915767627">"Sa kalawakan"</string>
-    <string name="effect_backdropper_sunset" msgid="7354053769863638757">"Takipsilim"</string>
-    <string name="effect_backdropper_gallery" msgid="2333888391153564920">"Ang iyong video"</string>
-    <string name="video_snapshot_hint" msgid="2707403607250082339">"Pindutin upang kumuha ng larawan habang nagre-record."</string>
-    <string name="video_recording_started" msgid="3374878415050991030">"Nagsimula na ang pag-record ng video."</string>
-    <string name="video_recording_stopped" msgid="4658626532857624974">"Tumigil ang pag-record ng video."</string>
-    <string name="clear_effects" msgid="6192797848995967992">"I-clear ang effects"</string>
-    <string name="effect_silly_faces" msgid="7952713419757286453">"MGA KATAWA-TAWANG MUKHA"</string>
-    <string name="effect_background" msgid="1358432220077975015">"BACKGROUND"</string>
-    <string name="accessibility_shutter_button" msgid="6040483605347230438">"Shutter"</string>
-    <string name="accessibility_menu_button" msgid="7692103503958544723">"Button ng menu"</string>
-    <string name="accessibility_mode_picker" msgid="5107120667206453381">"Tagapili ng camera, video, o panorama"</string>
-    <string name="accessibility_check_box" msgid="1084094675439953723">"%1$s check box"</string>
-    <string name="accessibility_switch_to_camera" msgid="4518394037216725274">"Lumipat sa larawan"</string>
-    <string name="accessibility_switch_to_video" msgid="8174781871592793967">"Lumipat sa video"</string>
-    <string name="accessibility_switch_to_panorama" msgid="8322228859117808037">"Lumipat sa panorama"</string>
-    <string name="accessibility_switch_to_photo_sphere" msgid="5803217570370854725">"Lumipat sa Photo Sphere"</string>
-    <string name="accessibility_switch_to_gcam" msgid="7562625440767034695">"Lumipat sa mataas na kalidad"</string>
-    <string name="accessibility_review_cancel" msgid="5462850829869569629">"Pagkansela sa pagsusuri"</string>
-    <string name="accessibility_review_ok" msgid="3486465319880320270">"Tapos na ang pagsusuri"</string>
-    <string name="accessibility_review_retake" msgid="2547112860787022130">"Review retake"</string>
-    <string name="capital_on" msgid="1118214824959797269">"I-ON"</string>
-    <string name="capital_off" msgid="3020696135020167263">"I-OFF"</string>
-    <string name="pref_video_time_lapse_frame_interval_off" msgid="3909611941842585497">"Naka-off"</string>
-    <string name="pref_video_time_lapse_frame_interval_500" msgid="1425296755074319221">"0.5 segundo"</string>
-    <string name="pref_video_time_lapse_frame_interval_1000" msgid="9126255690984179200">"1 segundo"</string>
-    <string name="pref_video_time_lapse_frame_interval_1500" msgid="5793250074165436905">"1.5 segundo"</string>
-    <string name="pref_video_time_lapse_frame_interval_2000" msgid="1821755013078449188">"2 segundo"</string>
-    <string name="pref_video_time_lapse_frame_interval_2500" msgid="8027471301321122045">"2.5 segundo"</string>
-    <string name="pref_video_time_lapse_frame_interval_3000" msgid="1411114492405867872">"3 segundo"</string>
-    <string name="pref_video_time_lapse_frame_interval_4000" msgid="1197483421014140132">"4 na segundo"</string>
-    <string name="pref_video_time_lapse_frame_interval_5000" msgid="7211885329755347592">"5 segundo"</string>
-    <string name="pref_video_time_lapse_frame_interval_6000" msgid="6665825017557898190">"6 na segundo"</string>
-    <string name="pref_video_time_lapse_frame_interval_10000" msgid="1126841483618922521">"10 segundo"</string>
-    <string name="pref_video_time_lapse_frame_interval_12000" msgid="8769265988037327085">"12 segundo"</string>
-    <string name="pref_video_time_lapse_frame_interval_15000" msgid="1452711342185926617">"15 segundo"</string>
-    <string name="pref_video_time_lapse_frame_interval_24000" msgid="2505505645705111419">"24 na segundo"</string>
-    <string name="pref_video_time_lapse_frame_interval_30000" msgid="3965378176246680626">"0.5 minuto"</string>
-    <string name="pref_video_time_lapse_frame_interval_60000" msgid="1878467100201983878">"1 minuto"</string>
-    <string name="pref_video_time_lapse_frame_interval_90000" msgid="496651530019049822">"1.5 minuto"</string>
-    <string name="pref_video_time_lapse_frame_interval_120000" msgid="126293364329503816">"2 minuto"</string>
-    <string name="pref_video_time_lapse_frame_interval_150000" msgid="3469164780802564276">"2.5 minuto"</string>
-    <string name="pref_video_time_lapse_frame_interval_180000" msgid="6840421790710639463">"3 minuto"</string>
-    <string name="pref_video_time_lapse_frame_interval_240000" msgid="1682865866425206481">"4 na minuto"</string>
-    <string name="pref_video_time_lapse_frame_interval_300000" msgid="6068734332915957652">"5 minuto"</string>
-    <string name="pref_video_time_lapse_frame_interval_360000" msgid="4692565393277579688">"6 na minuto"</string>
-    <string name="pref_video_time_lapse_frame_interval_600000" msgid="7109530398883649472">"10 minuto"</string>
-    <string name="pref_video_time_lapse_frame_interval_720000" msgid="259321148909130247">"12 minuto"</string>
-    <string name="pref_video_time_lapse_frame_interval_900000" msgid="6814816608134052996">"15 minuto"</string>
-    <string name="pref_video_time_lapse_frame_interval_1440000" msgid="5691479246748705053">"24 na minuto"</string>
-    <string name="pref_video_time_lapse_frame_interval_1800000" msgid="8331728629455012478">"0.5 oras"</string>
-    <string name="pref_video_time_lapse_frame_interval_3600000" msgid="4829442147263610121">"1 oras"</string>
-    <string name="pref_video_time_lapse_frame_interval_5400000" msgid="7011488725038113884">"1.5 oras"</string>
-    <string name="pref_video_time_lapse_frame_interval_7200000" msgid="7399563587870916008">"2 oras"</string>
-    <string name="pref_video_time_lapse_frame_interval_9000000" msgid="1545856778907835970">"2.5 oras"</string>
-    <string name="pref_video_time_lapse_frame_interval_10800000" msgid="4064231412857457518">"3 oras"</string>
-    <string name="pref_video_time_lapse_frame_interval_14400000" msgid="5174457951350690217">"4 na oras"</string>
-    <string name="pref_video_time_lapse_frame_interval_18000000" msgid="5091441456160949740">"5 oras"</string>
-    <string name="pref_video_time_lapse_frame_interval_21600000" msgid="6924571987775154098">"6 na oras"</string>
-    <string name="pref_video_time_lapse_frame_interval_36000000" msgid="6959912631566981301">"10 oras"</string>
-    <string name="pref_video_time_lapse_frame_interval_43200000" msgid="6426833030111269499">"12 oras"</string>
-    <string name="pref_video_time_lapse_frame_interval_54000000" msgid="6688725497680331090">"15 oras"</string>
-    <string name="pref_video_time_lapse_frame_interval_86400000" msgid="5510320806095156153">"24 na oras"</string>
-    <string name="time_lapse_seconds" msgid="7319683099532506270">"segundo"</string>
-    <string name="time_lapse_minutes" msgid="5325447383033224679">"minuto"</string>
-    <string name="time_lapse_hours" msgid="5294001144133261436">"oras"</string>
-    <string name="time_lapse_interval_set" msgid="2418594453248958440">"Tapos na"</string>
-    <string name="set_time_interval" msgid="2531393962847535331">"Itakda ang Agwat ng Oras"</string>
-    <string name="set_time_interval_help" msgid="64145154088021389">"Naka-off ang tampok na time lapse. I-on ito upang itakda ang agwat ng oras."</string>
-    <string name="set_duration" msgid="1638453882581604341">"Itakda ang tagal sa loob ng ilang segundo"</string>
-    <string name="count_down_title_text" msgid="7586031110595513050">"Nagka-count down upang kumuha ng larawan"</string>
-    <string name="remember_location_title" msgid="3045040613094030429">"Tandaan ang mga lokasyon ng larawan?"</string>
-    <string name="remember_location_prompt" msgid="5104210757873140169">"I-tag ang iyong mga larawan at video sa mga lokasyon kung saan kinunan ang mga iyon.\n\nMaaaring i-access ng ibang apps ang impormasyong ito kasama ng iyong mga na-save na larawan."</string>
-    <string name="remember_location_no" msgid="4412802756840226925">"Hindi, salamat na lang"</string>
-    <string name="remember_location_yes" msgid="4339424460683531388">"Oo"</string>
-    <string name="camera_menu_more_label" msgid="7951917844735828365">"HIGIT PANG MGA OPSYON"</string>
-    <string name="camera_menu_settings_label" msgid="3862756725328016822">"MGA SETTING"</string>
-    <string name="create_tiny_planet" msgid="5186918191372107343">"Gumawa ng Maliit na Planeta"</string>
-    <string name="saving_tiny_planet" msgid="8828265180177375494">"Sine-save Maliit na Planeta …"</string>
-    <string name="tiny_planet_zoom" msgid="2985522360577158474">"I-zoom"</string>
-    <string name="tiny_planet_rotate" msgid="5445336705705350004">"I-rotate"</string>
-    <string name="crop_save" msgid="2841974981340098579">"I-save"</string>
-    <string name="cannot_load_image" msgid="4100136187076585580">"Hindi ma-load ang larawan!"</string>
-    <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Filmstrip view"</string>
-    <string name="setting_wallpaper" msgid="2397759659347872725">"Itinatakda ang wallpaper"</string>
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- The name of the Android Camera application. [CHAR LIMIT=16] -->
+  <!-- The label for the Video Camera activity. [CHAR LIMIT=16] -->
+  <!-- Used to format short video duration in Details dialog. minutes:seconds e.g. 00:30 -->
+  <!-- Used to format video duration in Details dialog. hours:minutes:seconds e.g. 0:21:30 -->
+  <!-- Displayed in the title of the dialog for things to do with a picture
+             that is to be "set as" (e.g. set as contact photo or set as wallpaper) -->
+  <!-- Details dialog "OK" button. Dismisses dialog. -->
+  <!-- String Delete the selected media item(s) [CHAR LIMIT=50] -->
+  <!-- The label shown after an image is deleted [CHAR LIMIT=16] -->
+  <!-- The label on the button which when clicked will undo a deletion of image [CHAR LIMIT=16]-->
+  <!-- String indicating how many media item(s) is(are) selected
+            eg. 1 selected [CHAR LIMIT=30] -->
+  <!-- String indicating how many media album(s) is(are) selected
+            eg. 1 selected [CHAR LIMIT=30] -->
+  <!-- String indicating how many media group(s) is(are) selected
+            eg. 1 selected [CHAR LIMIT=30] -->
+  <!-- String indicating timestamp of photo or video -->
+  <!-- String used as a menu label. The user can choose to edit the image
+         [CHAR_LIMIT=20]-->
+  <!-- The title of the menu item to let user crop the image. [CHAR LIMIT=15] -->
+  <!-- The title of the menu item to let user trim the video. [CHAR LIMIT=15] -->
+  <!-- The title of the menu item to let user set the image as background etc. [CHAR LIMIT=15] -->
+  <!-- String indicating an error when playing the video. [CHAR LIMIT=30] -->
+  <!-- Toast message shown when the cropped image has been saved in the
+         %s folder (string: folder_download) [CHAR LIMIT=50]-->
+  <!-- Text indicating the title of a media item in details window [CHAR LIMIT=14] -->
+  <!-- Text indicating the description of a media item in details window [CHAR LIMIT=14] -->
+  <!-- Text indicating the creation time of a media item in details window [CHAR LIMIT=14] -->
+  <!-- Text indicating the location of a media item in details window [CHAR LIMIT=14] -->
+  <!-- Text indicating the path of a media item in details window [CHAR LIMIT=14] -->
+  <!-- Text indicating the width of a media item in details window [CHAR LIMIT=14] -->
+  <!-- Text indicating the height of a media item in details window [CHAR LIMIT=14] -->
+  <!-- Text indicating the orientation of a media item in details window [CHAR LIMIT=14] -->
+  <!-- Text indicating the duration of a video item in details window [CHAR LIMIT=18] -->
+  <!-- Text indicating the mime type of a media item in details window [CHAR LIMIT=14] -->
+  <!-- Text indicating the file size of a media item in details window [CHAR LIMIT=14] -->
+  <!-- Text indicating the maker of a media item in details window [CHAR LIMIT=14] -->
+  <!-- Text indicating the model of a media item in details window [CHAR LIMIT=14] -->
+  <!-- Text indicating flash info of a media item in details window [CHAR LIMIT=14] -->
+  <!-- Text indicating aperture of a media item in details window [CHAR LIMIT=14] -->
+  <!-- Text indicating the focal length of a media item in details window [CHAR LIMIT=14] -->
+  <!-- Text indicating the white balance of a media item in details window [CHAR LIMIT=18] -->
+  <!-- Text indicating the exposure time of a media item in details window [CHAR LIMIT=14] -->
+  <!-- Text indicating the ISO speed rating of a media item in details window [CHAR LIMIT=14] -->
+  <!-- String indicating the time units in seconds. [CHAR LIMIT=8] -->
+  <!-- String indicating the length units in milli-meters. [CHAR LIMIT=8] -->
+  <!-- String indicating how camera shooting feature is used. [CHAR LIMIT=12] -->
+  <!-- String indicating how camera shooting feature is used. [CHAR LIMIT=12 -->
+  <!-- String indicating camera flash is fired. [CHAR LIMIT=14] -->
+  <!-- String indicating camera flash is not used. [CHAR LIMIT=14] -->
+  <!-- String indicating image width or height is unknown. [CHAR LIMIT=14] -->
+  <!-- Toast message shown after we try to make a local album available offline
+         [CHAR LIMIT=150] -->
+  <!-- The content of a dialog showing trimming in progress. [CHAR LIMIT=30] -->
+  <!-- Text to show with progress bar while stitching a photo sphere. 'Photo sphere' is a product name. [CHAR LIMIT=35]-->
+  <!-- title for the dialog showing the error of camera hardware -->
+  <!-- message for the dialog showing the error of camera hardware -->
+  <!-- message for the dialog showing the camera is disabled because of security policies. Camera cannot be used. -->
+  <!-- message for the dialog showing that the app does not have sufficient permissions [CHAR LIMIT=NONE] -->
+  <!-- Dialog "Dismiss" button. Closes the dialog [CHAR LIMIT=12]-->
+  <!-- alert to the user to wait for some operation to complete -->
+  <!-- alert to the user that an SD card must be installed before using the camera -->
+  <!-- alert to the user that the SD card is being disk-checked -->
+  <!-- alert to the user that the camera fails to read or write the SD card. -->
+  <!-- A label that overlays on top of the preview frame to indicate the camcorder is in time lapse mode [CHAR LIMIT=35] -->
+  <!-- Screen display message during image capture to indicate that the capture is in progress, like during HDR+. [CHAR LIMIT=20] -->
+  <!-- Settings screen, camera selection dialog title. Users can select a camera from the phone (front-facing or back-facing). [CHAR LIMIT=20] -->
+  <!-- In select camera setting, back facing camera. [CHAR LIMIT=14] -->
+  <!-- In select camera setting, front-facing camera. [CHAR LIMIT=14] -->
+  <!-- Settings screen, setting title text -->
+  <!--  Label for record location preference [CHAR LIMIT=50] -->
+  <!-- Title for countdown timer on camera settings screen [CHAR LIMIT=30]-->
+  <!-- Entry for countdown timer setting. e.g. 1 second, 10 seconds, etc. [CHAR LIMIT=30]-->
+  <!-- Text followed by a checkbox to turn on/off sound effects during the countdown. [CHAR LIMIT = 24]-->
+  <!-- Entry of camera save path -->
+  <!-- Entry of a on/off setting. The setting is turned off. [CHAR LIMIT=15] -->
+  <!-- Entry of a on/off setting. The setting is turned on. [CHAR LIMIT=15] -->
+  <!-- The value of a camera preference indicating the setting is off. -->
+  <!-- The value of a camera preference indicating the setting is on. -->
+  <!-- The Video quality settings in preference [CHAR LIMIT=21] -->
+  <!-- The default quality value is NULL -->
+  <!-- Video quality setting entry.
+    Videos will be recorded in 4k DCI quality. [CHAR LIMIT=24] -->
+  <!-- Video quality setting entry.
+    Videos will be recorded in 4k UHD quality. [CHAR LIMIT=24] -->
+  <!-- Video quality setting entry. Videos will be recorded in 1080p quality. [CHAR LIMIT=24] -->
+  <!-- Video quality setting entry. Videos will be recorded in 720p quality. [CHAR LIMIT=24] -->
+  <!-- Video quality setting entry. Videos will be recorded in 480p quality. [CHAR LIMIT=24] -->
+  <!-- Video quality setting entry. Videos will be recorded in QHD quality. [CHAR LIMIT=24] -->
+  <!-- Video quality setting entry. Videos will be recorded in 2K quality. [CHAR LIMIT=24] -->
+  <!-- Describes the preference dialog for choosing interval between frame capture for
+    time lapse recording. Appears at top of the dialog. [CHAR LIMIT=30] -->
+  <!-- Settings screen, Camera setting category title -->
+  <!-- Settings screen, Camcorder setting category title -->
+  <!-- Settings screen, Picture size title -->
+  <!-- Settings screen, Focus mode title -->
+  <!-- Settings screen, Focus mode dialog radio button choices -->
+  <!-- A setting that lets the camera focus into infinity. [CHAR LIMIT=20] -->
+  <!-- A setting that lets the camera operate in macro focus mode for nearby objects. [CHAR LIMIT=20] -->
+  <!-- Menu, focus mode labels [CHAR LIMIT=50] -->
+  <!-- Default flash mode setting.-->
+  <!-- Value for flash off setting-->
+  <!-- Settings screen, Flash mode title -->
+  <!-- Settings screen, Flash mode 'auto'. [CHAR LIMIT=12] -->
+  <!-- Settings screen, Flash mode 'alway on'. [CHAR LIMIT=12] -->
+  <!-- Settings screen, Flash mode 'always off'. [CHAR LIMIT=12] -->
+  <!-- Menu, flash mode labels [CHAR LIMIT=50] -->
+  <!-- Default videocamera flash mode setting.-->
+  <!-- Default white balance setting. -->
+  <!-- Settings screen, white balance title -->
+  <!-- Menu, white balance label -->
+  <!-- Settings screen, White balance dialog radio button choices -->
+  <!-- Menu, White balance labels [CHAR LIMIT=50] -->
+  <!-- Default scene mode setting. -->
+  <!-- Settings screen, Select Scene mode -->
+  <!-- Settings menu, scene mode choices [CHAR LIMIT=16] -->
+  <!-- Scene mode that uses HDR plus (better HDR) [CHAR LIMIT=16] -->
+  <!-- Scene mode that uses HDR (high dynamic range) [CHAR LIMIT=16] -->
+  <!-- Scene mode to turn on HDR (better high dynamic range) [CHAR LIMIT=50] -->
+  <!-- Scene mode to turn off HDR (better high dynamic range) [CHAR LIMIT=50] -->
+  <!-- Scene mode to turn on HDR (high dynamic range) [CHAR LIMIT=50] -->
+  <!-- Scene mode to turn off HDR (high dynamic range) [CHAR LIMIT=50] -->
+  <!-- Scene mode that takes an image quickly with little motion blur. [CHAR LIMIT=16] -->
+  <!-- Scene mode that takes long exposures to capture night scenes without flash. [CHAR LIMIT=16] -->
+  <!-- Scene mode optimized for taking images in the sunset. [CHAR LIMIT=16] -->
+  <!-- Scene mode optimized for taking indoor low-lights pictures. [CHAR LIMIT=16] -->
+  <!-- Scene mode for refocus feature [CHAR LIMIT=16] -->
+  <!-- Settings menu, scene mode labels [CHAR LIMIT=50] -->
+  <!-- Scene mode that takes an image quickly with little motion blur. [CHAR LIMIT=50] -->
+  <!-- Scene mode that takes long exposures to capture night scenes without flash. [CHAR LIMIT=50] -->
+  <!-- Scene mode optimized for taking images in the sunset. [CHAR LIMIT=50] -->
+  <!-- Scene mode optimized for taking indoor low-lights pictures. [CHAR LIMIT=50] -->
+  <!-- Settings menu countdown timer off [CHAR LIMIT=50] -->
+  <!-- Settings menu countdown timer 1 second [CHAR LIMIT=50] -->
+  <!-- Settings menu countdown timer 3 seconds [CHAR LIMIT=50] -->
+  <!-- Settings menu countdown timer 10 seconds [CHAR LIMIT=50] -->
+  <!-- Settings menu countdown timer 15 seconds [CHAR LIMIT=50] -->
+  <!-- Toast after trying to select a setting that is not allowed to change in scene mode [CHAR LIMIT=NONE] -->
+  <!-- Toast after enable HDR function to inform Continuous Shot has disabled -->
+  <!-- Toast after enable Advanced Capture function to inform Continuous Shot has disabled -->
+  <!-- Toast after enable 2k4k video quality to inform IS has disabled -->
+  <!-- Toast after 2k4k video is enabled to inform SeeMore has been disabled -->
+  <!-- Toast after High Quality Noise Reduction has been enabled to show CDS is disabled -->
+  <!-- Toast after High Quality Noise Reduction has been enabled to show TNR is disabled -->
+  <!-- Toast after SeeMore has been enabled to show CDS is disabled -->
+  <!-- Toast after SeeMore has been enabled to show TNR is disabled -->
+  <!-- Toast after SeeMore has been enabled to show NR is disabled -->
+  <!-- Exposure settings in preference -->
+  <!--  menu label exposure compensation [CHAR LIMIT=50] -->
+  <!-- Default HDR entry value -->
+  <!-- Default HDR+ entry value -->
+  <!-- HDR label ON [CHAR LIMIT=60] -->
+  <!-- switch camera label back [CHAR LIMIT=60] -->
+  <!-- switch camera label front [CHAR LIMIT=60] -->
+  <!-- Dialog "OK" button. Dismisses dialog. -->
+  <!-- Low-memory dialog message [CHAR LIMIT=NONE] -->
+  <!-- Camera format string for new image files. Passed to java.text.SimpleDateFormat. -->
+  <!-- Video Camera format string for new video files. Passed to java.text.SimpleDateFormat. -->
+  <!-- Filename prefix for panorama output. -->
+  <!-- The message shown when video record reaches size limit. -->
+  <!-- The text shown when the panorama panning speed is to fast [CHAR LIMIT=16] -->
+  <!-- The text shown in the progress dialog when panorama preview is generating in the background [CHAR LIMIT=30] -->
+  <!-- The text shown in the dialog when panorama saving failed [CHAR LIMIT=40] -->
+  <!-- The text shown on the dialog title in the dialogs for Panorama [CHAR LIMIT=12] -->
+  <!-- The text shown on the top-left corner of the screen to indicate the capturing is on going [CHAR LIMIT=27] -->
+  <!-- The text shown in the progress dialog when waiting for previous panorama finishing [CHAR LIMIT=40] -->
+  <!-- The text shown on the bottom-left corner of the screen to indicate that the saving is in process [CHAR LIMIT=13] -->
+  <!-- The text shown on the screen to indicate that the panorama is rendering [CHAR LIMIT=27] -->
+  <!-- Toast telling users tapping on the viewfinder will trigger autofocus [CHAR LIMIT=28] -->
+  <!-- Default effect setting that clears the effect. -->
+  <!-- Title of video effect setting popup window -->
+  <!-- Effect setting item that clear the effect. [CHAR LIMIT=14] -->
+  <!-- Effect setting item that squeezes the face. [CHAR LIMIT=14] -->
+  <!-- Effect setting item that makes eyes big. [CHAR LIMIT=14] -->
+  <!-- Effect setting item that makes mouth big. [CHAR LIMIT=14] -->
+  <!-- Effect setting item that makes mouth small. [CHAR LIMIT=14] -->
+  <!-- Effect setting item that makes nose big. [CHAR LIMIT=14] -->
+  <!-- Effect setting item that makes eyes small. [CHAR LIMIT=14] -->
+  <!-- Effect setting item that replaces background with Android in Space. [CHAR LIMIT=14] -->
+  <!-- Effect setting item that replaces background with a sunset. [CHAR LIMIT=14] -->
+  <!-- Effect setting item that replaces background with video from gallery. [CHAR LIMIT=14] -->
+  <!-- Toast telling users tapping on the viewfinder will take a picture [CHAR LIMIT=54] -->
+  <!-- Announcement telling users video recording has just started [CHAR LIMIT=NONE] -->
+  <!-- Announcement telling users video recording has just stopped [CHAR LIMIT=NONE] -->
+  <!-- A button in effect setting popup to clear the effect. [CHAR LIMIT=26] -->
+  <!-- Title of category for silly face effects. [CHAR LIMIT=26] -->
+  <!-- Title of category for background replacement effects. [CHAR LIMIT=26] -->
+  <!-- The shutter button. [CHAR LIMIT = NONE] -->
+  <!-- The menu button. [CHAR LIMIT = NONE] -->
+  <!-- The mode picker to switch between camera, video and panorama. [CHAR LIMIT = NONE] -->
+  <!-- The check box in camera settings, such as store location. [CHAR LIMIT = NONE] -->
+  <!-- The button to switch to Camera mode. [CHAR LIMIT = NONE] -->
+  <!-- The button to switch to Video mode. [CHAR LIMIT = NONE] -->
+  <!-- The button to switch to Panorama mode. [CHAR LIMIT = NONE] -->
+  <!-- The button to switch to the Photo Sphere mode. [CHAR LIMIT = NONE] -->
+  <!-- The button to switch to the high quality mode. [CHAR LIMIT = NONE] -->
+  <!-- The button in review mode indicating that the photo taking, video recording, and panorama saving session should be canceled [CHAR LIMIT = NONE] -->
+  <!-- The button in review mode indicating that the taken photo/video is OK to be attached/uploaded [CHAR LIMIT = NONE] -->
+  <!-- button in review mode indicate the user want to retake another photo/video for attachment [
+CHAR LIMIT = NONE] -->
+  <!-- Default text for a button that can be toggled on and off. -->
+  <!-- Default text for a button that can be toggled on and off. -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <!-- Seconds: a unit of time for time lapse intervals. [CHAR LIMIT = 20] -->
+  <!-- Minutes: a unit of time for time lapse intervals. [CHAR LIMIT = 20] -->
+  <!-- Hours: a unit of time for time lapse intervals. [CHAR LIMIT = 20] -->
+  <!-- The button to confirm time-lapse setting changes. [CHAR LIMIT = 20] -->
+  <!-- Title in time interval picker for setting time interval. [CHAR LIMIT = 30]-->
+  <!-- Help text that is shown when the time lapse feature is turned off. [CHAR LIMIT = 180]-->
+  <!-- Title in timer setting for setting the duration for the countdown timer. [CHAR LIMIT = 50]-->
+  <!-- On-screen hint during timer countdown for taking a photo. [CHAR LIMIT = 60]-->
+  <!-- Title for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 50] -->
+  <!-- Message for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = None] -->
+  <!-- Negative answer for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 20] -->
+  <!-- Positive answer for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 20] -->
+  <!-- Camera menu labels -->
+  <!-- more options label [CHAR LIMIT=50] -->
+  <!-- settings label [CHAR LIMIT=50] -->
+  <!--  Tiny Planet -->
+  <!-- Button to press for creating a tiny planet image. [CHAR LIMIT = 30] -->
+  <!-- Message shown while a tiny planet image is being saved. [CHAR LIMIT = 30] -->
+  <!-- Label above a slider that let's the user set the zoom of a tiny planet image. [CHAR LIMIT = 15] -->
+  <!-- Label above a slider that let's the user set the rotation of a tiny planet image. [CHAR LIMIT = 15] -->
+  <!-- Crop -->
+  <!-- Label for the save button in the crop activity action bar [CHAR LIMIT=20] -->
+  <!--  String shown when we cannot load the image when starting the activity [CHAR LIMIT=NONE] -->
+  <!-- Label for album filmstrip button -->
+  <!--  String shown when setting the homepage wallpaper in the background [CHAR LIMIT=NONE] -->
+  <!-- Menu, Video rotation labels [CHAR LIMIT=50] -->
 </resources>
diff --git a/res/values-tr/qcomstrings.xml b/res/values-tr/qcomstrings.xml
index 62909745f..e5415c102 100644
--- a/res/values-tr/qcomstrings.xml
+++ b/res/values-tr/qcomstrings.xml
@@ -160,7 +160,6 @@
   <string name="pref_camera_shuttersound_title" translatable="true">Deklanşör sesi</string>
   <string name="pref_camera_shuttersound_entry_enable">Etkinleştirildi</string>
   <string name="pref_camera_shuttersound_entry_disable">Devre dışı</string>
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">Yüksek-framerate kayıt sabitleme, Sabitleştirme/Zaman atlama/HDR kullanılırken desteklenmiyor.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -364,11 +363,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">HDR Sensörü</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">Çoklu kare HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR sensörünün 1x kareye ihtiyacı var</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Video döndürme</string>
@@ -427,6 +421,7 @@
   <string name="pref_camera2_camera2_entry_enable">Etkinleştir</string>
   <string name="pref_camera2_camera2_entry_disable">Devre dışı</string>
   <string name="pref_camera2_mono_only_title">Sadece mono</string>
+  <string name="pref_camera2_mono_only_entry_off">Kapalı</string>
   <string name="pref_camera2_mono_preview_title">Mono önizleme</string>
   <string name="pref_camera2_mono_preview_entry_on">Açık</string>
   <string name="pref_camera2_mono_preview_entry_off">Kapalı</string>
@@ -438,6 +433,7 @@
   <string name="pref_camera2_mpo_entry_on">Açık</string>
   <string name="pref_camera2_mpo_entry_off">Kapalı</string>
   <string name="pref_camera2_makeup_title">Makyaj</string>
+  <string name="pref_camera2_makeup_entry_off">Kapalı</string>
   <string name="pref_camera2_noise_reduction_title">Parazit azaltma</string>
   <string name="pref_camera2_noise_reduction_entry_off">Kapalı</string>
   <string name="pref_camera2_noise_reduction_entry_fast">Hızlı</string>
@@ -446,10 +442,12 @@
   <string name="pref_camera2_videosnap_entry_enable">Etkinleştir</string>
   <string name="pref_camera2_videosnap_entry_disable">Devre dışı</string>
   <string name="pref_camera2_trackingfocus_title">Odak izleme</string>
+  <string name="pref_camera2_trackingfocus_entry_off">Kapalı</string>
   <string name="pref_camera_scenemode_entry_bestpicture">En iyi görüntü</string>
   <string name="bestpicture_done">BİTTİ</string>
   <string name="bestpicture_at_least_one_picture">En az bir resim seçilmeli.</string>
   <string name="pref_camera2_shutter_sound_entry_on">Açık</string>
   <string name="pref_camera2_shutter_sound_entry_off">Kapalı</string>
   <string name="pref_camera2_shutter_sound_title">Deklanşör sesi</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Mono</string>
 </resources>
diff --git a/res/values-ug/qcomstrings.xml b/res/values-ug/qcomstrings.xml
index 1ba6cabf8..7dec97a7b 100644
--- a/res/values-ug/qcomstrings.xml
+++ b/res/values-ug/qcomstrings.xml
@@ -131,7 +131,6 @@
   <!-- Settings screen, Select Redeye Reduction -->
   <string name="pref_camera_redeyereduction_title">قىزىل كۆز ئوڭشاش</string>
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">مۇقىملاشتۇرۇش\ۋاقىت ئۇزارتىش\HDR يوقىرى كاندۇك سۈرەتكە ئېلىشنى قوللىمايدۇ.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -310,11 +309,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">سېنزور HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">كۆپ كاندۇك HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR 1x كاندۇكقا ئېھتىياجلىق</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">سىننى ئايلاندۇرۇش</string>
@@ -336,9 +330,13 @@
   <string name="all_in_focus">پۈتۈن فوكىس</string>
   <string name="refocus_toast">ئالدىنقى رەسىمنى قايتا فوكىسلاش ئۈچۈن، بۇ يەرنى چىكىڭ</string>
   <!-- Help menu strings -->
+  <string name="pref_camera2_mono_only_entry_off">تاقاق</string>
   <string name="pref_camera2_mono_preview_entry_off">تاقاق</string>
   <string name="pref_camera2_clearsight_entry_off">تاقاق</string>
   <string name="pref_camera2_mpo_entry_off">تاقاق</string>
+  <string name="pref_camera2_makeup_entry_off">تاقاق</string>
   <string name="pref_camera2_noise_reduction_entry_off">تاقاق</string>
+  <string name="pref_camera2_trackingfocus_entry_off">تاقاق</string>
   <string name="pref_camera2_shutter_sound_entry_off">تاقاق</string>
+  <string name="pref_camera2_initial_camera_entry_mono">رەڭسىز</string>
 </resources>
diff --git a/res/values-uk/qcomstrings.xml b/res/values-uk/qcomstrings.xml
index 18b9e284a..26476ac96 100644
--- a/res/values-uk/qcomstrings.xml
+++ b/res/values-uk/qcomstrings.xml
@@ -160,7 +160,6 @@
   <string name="pref_camera_shuttersound_title" translatable="true">Звук затвору</string>
   <string name="pref_camera_shuttersound_entry_enable">Увімкнено</string>
   <string name="pref_camera_shuttersound_entry_disable">Вимкнено</string>
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">Запис із високою частотою кадрів не підтримується при використанні стабілізації/Time lapse/HDR.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -364,11 +363,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">Датчик HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">Мультикадровий HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR потребує 1x кадр</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Обертання відео</string>
@@ -427,6 +421,7 @@
   <string name="pref_camera2_camera2_entry_enable">Увімкнути</string>
   <string name="pref_camera2_camera2_entry_disable">Вимкнути</string>
   <string name="pref_camera2_mono_only_title">Тільки моно</string>
+  <string name="pref_camera2_mono_only_entry_off">Вимкнено</string>
   <string name="pref_camera2_mono_preview_title">Попередній перегляд моно</string>
   <string name="pref_camera2_mono_preview_entry_on">Увімк</string>
   <string name="pref_camera2_mono_preview_entry_off">Вимкнено</string>
@@ -438,6 +433,7 @@
   <string name="pref_camera2_mpo_entry_on">Увімк</string>
   <string name="pref_camera2_mpo_entry_off">Вимкнено</string>
   <string name="pref_camera2_makeup_title">Макіяж</string>
+  <string name="pref_camera2_makeup_entry_off">Вимкнено</string>
   <string name="pref_camera2_noise_reduction_title">Зниження шумів</string>
   <string name="pref_camera2_noise_reduction_entry_off">Вимкнено</string>
   <string name="pref_camera2_noise_reduction_entry_fast">Швидко</string>
@@ -446,10 +442,12 @@
   <string name="pref_camera2_videosnap_entry_enable">Увімкнути</string>
   <string name="pref_camera2_videosnap_entry_disable">Вимкнути</string>
   <string name="pref_camera2_trackingfocus_title">Фокус відстеження</string>
+  <string name="pref_camera2_trackingfocus_entry_off">Вимкнено</string>
   <string name="pref_camera_scenemode_entry_bestpicture">Найкращий знімок</string>
   <string name="bestpicture_done">Готово</string>
   <string name="bestpicture_at_least_one_picture">Потрібно вибрати хоча б один знімок.</string>
   <string name="pref_camera2_shutter_sound_entry_on">Увімк</string>
   <string name="pref_camera2_shutter_sound_entry_off">Вимкнено</string>
   <string name="pref_camera2_shutter_sound_title">Звук затвору</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Монохром</string>
 </resources>
diff --git a/res/values-ur-rPK/qcomstrings.xml b/res/values-ur-rPK/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-ur-rPK/qcomstrings.xml
+++ b/res/values-ur-rPK/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-uz-rUZ/qcomstrings.xml b/res/values-uz-rUZ/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-uz-rUZ/qcomstrings.xml
+++ b/res/values-uz-rUZ/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-vec-rIT/qcomstrings.xml b/res/values-vec-rIT/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-vec-rIT/qcomstrings.xml
+++ b/res/values-vec-rIT/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-vi/qcomstrings.xml b/res/values-vi/qcomstrings.xml
index 142ab4c42..5ac7169a6 100644
--- a/res/values-vi/qcomstrings.xml
+++ b/res/values-vi/qcomstrings.xml
@@ -160,7 +160,6 @@
   <string name="pref_camera_shuttersound_title" translatable="true">Âm chụp ảnh</string>
   <string name="pref_camera_shuttersound_entry_enable">Đã bật</string>
   <string name="pref_camera_shuttersound_entry_disable">Đã tắt</string>
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">Quay với tốc độ khung cao không được hỗ trợ khi sử dụng chế độ Ổn định/Tua thời gian/HDR.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -364,11 +363,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">Cảm biến HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">HDR đa khung</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR cần 1 x khung</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Xoay video</string>
@@ -427,6 +421,7 @@
   <string name="pref_camera2_camera2_entry_enable">Bật</string>
   <string name="pref_camera2_camera2_entry_disable">Tắt</string>
   <string name="pref_camera2_mono_only_title">Chỉ âm thanh đơn</string>
+  <string name="pref_camera2_mono_only_entry_off">Tắt</string>
   <string name="pref_camera2_mono_preview_title">Xem trước âm thanh đơn</string>
   <string name="pref_camera2_mono_preview_entry_on">Bật</string>
   <string name="pref_camera2_mono_preview_entry_off">Tắt</string>
@@ -438,6 +433,7 @@
   <string name="pref_camera2_mpo_entry_on">Bật</string>
   <string name="pref_camera2_mpo_entry_off">Tắt</string>
   <string name="pref_camera2_makeup_title">Làm đẹp</string>
+  <string name="pref_camera2_makeup_entry_off">Tắt</string>
   <string name="pref_camera2_noise_reduction_title">Giảm nhiễu</string>
   <string name="pref_camera2_noise_reduction_entry_off">Tắt</string>
   <string name="pref_camera2_noise_reduction_entry_fast">Nhanh</string>
@@ -446,10 +442,12 @@
   <string name="pref_camera2_videosnap_entry_enable">Bật</string>
   <string name="pref_camera2_videosnap_entry_disable">Tắt</string>
   <string name="pref_camera2_trackingfocus_title">Lấy nét bám đuổi</string>
+  <string name="pref_camera2_trackingfocus_entry_off">Tắt</string>
   <string name="pref_camera_scenemode_entry_bestpicture">Hình ảnh tốt nhất</string>
   <string name="bestpicture_done">XONG</string>
   <string name="bestpicture_at_least_one_picture">Ít nhất một hình ảnh phải được chọn.</string>
   <string name="pref_camera2_shutter_sound_entry_on">Bật</string>
   <string name="pref_camera2_shutter_sound_entry_off">Tắt</string>
   <string name="pref_camera2_shutter_sound_title">Âm chụp ảnh</string>
+  <string name="pref_camera2_initial_camera_entry_mono">Đơn sắc</string>
 </resources>
diff --git a/res/values-zh-rCN/qcomstrings.xml b/res/values-zh-rCN/qcomstrings.xml
index e149799fb..31bccda36 100644
--- a/res/values-zh-rCN/qcomstrings.xml
+++ b/res/values-zh-rCN/qcomstrings.xml
@@ -160,7 +160,6 @@
   <string name="pref_camera_shuttersound_title" translatable="true">快门声音</string>
   <string name="pref_camera_shuttersound_entry_enable">已启用</string>
   <string name="pref_camera_shuttersound_entry_disable">已禁用</string>
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <string name="error_app_unsupported_hfr_selection">稳定化 / 延时 / HDR 不支持高帧率拍摄。</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -364,11 +363,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">传感器 HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">多帧 HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR 需要 1x 帧</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">视频旋转</string>
@@ -427,6 +421,7 @@
   <string name="pref_camera2_camera2_entry_enable">启用</string>
   <string name="pref_camera2_camera2_entry_disable">禁用</string>
   <string name="pref_camera2_mono_only_title">仅单色</string>
+  <string name="pref_camera2_mono_only_entry_off">关闭</string>
   <string name="pref_camera2_mono_preview_title">单色预览</string>
   <string name="pref_camera2_mono_preview_entry_on">开</string>
   <string name="pref_camera2_mono_preview_entry_off">关闭</string>
@@ -438,6 +433,7 @@
   <string name="pref_camera2_mpo_entry_on">开</string>
   <string name="pref_camera2_mpo_entry_off">关闭</string>
   <string name="pref_camera2_makeup_title">美颜</string>
+  <string name="pref_camera2_makeup_entry_off">关闭</string>
   <string name="pref_camera2_noise_reduction_title">降噪</string>
   <string name="pref_camera2_noise_reduction_entry_off">关闭</string>
   <string name="pref_camera2_noise_reduction_entry_fast">快速</string>
@@ -446,10 +442,12 @@
   <string name="pref_camera2_videosnap_entry_enable">启用</string>
   <string name="pref_camera2_videosnap_entry_disable">禁用</string>
   <string name="pref_camera2_trackingfocus_title">焦点跟踪</string>
+  <string name="pref_camera2_trackingfocus_entry_off">关闭</string>
   <string name="pref_camera_scenemode_entry_bestpicture">最佳图片</string>
   <string name="bestpicture_done">完成</string>
   <string name="bestpicture_at_least_one_picture">至少选择一张图片。</string>
   <string name="pref_camera2_shutter_sound_entry_on">开启</string>
   <string name="pref_camera2_shutter_sound_entry_off">关闭</string>
   <string name="pref_camera2_shutter_sound_title">快门声音</string>
+  <string name="pref_camera2_initial_camera_entry_mono">黑白</string>
 </resources>
diff --git a/res/values-zh-rHK/qcomstrings.xml b/res/values-zh-rHK/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-zh-rHK/qcomstrings.xml
+++ b/res/values-zh-rHK/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
diff --git a/res/values-zh-rTW/qcomstrings.xml b/res/values-zh-rTW/qcomstrings.xml
index 0adfab457..14eeb0cdf 100644
--- a/res/values-zh-rTW/qcomstrings.xml
+++ b/res/values-zh-rTW/qcomstrings.xml
@@ -160,8 +160,6 @@
   <string name="pref_camera_shuttersound_title" translatable="true">快門音效</string>
   <string name="pref_camera_shuttersound_entry_enable">已啟用</string>
   <string name="pref_camera_shuttersound_entry_disable">已停用</string>
-  <!-- Default mce setting. Do not translate. -->
-  <string name="pref_camera_mce_default">啟用</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">當使用穩定化/縮時/ HDR 時不支援高影格率拍攝</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
@@ -365,11 +363,6 @@
   <string name="pref_camera_hdr_mode_entry_sensor">感應器 HDR</string>
   <string name="pref_camera_hdr_mode_entry_multi_frame">多影格 HDR</string>
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <string name="pref_camera_hdr_need_1x_title">HDR 需要 1x 影格</string>
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">影片旋轉</string>
@@ -428,6 +421,7 @@
   <string name="pref_camera2_camera2_entry_enable">啟用</string>
   <string name="pref_camera2_camera2_entry_disable">停用</string>
   <string name="pref_camera2_mono_only_title">僅單色</string>
+  <string name="pref_camera2_mono_only_entry_off">關</string>
   <string name="pref_camera2_mono_preview_title">單色預覽</string>
   <string name="pref_camera2_mono_preview_entry_on">開</string>
   <string name="pref_camera2_mono_preview_entry_off">關</string>
@@ -439,6 +433,7 @@
   <string name="pref_camera2_mpo_entry_on">開</string>
   <string name="pref_camera2_mpo_entry_off">關</string>
   <string name="pref_camera2_makeup_title">美顏模式</string>
+  <string name="pref_camera2_makeup_entry_off">關</string>
   <string name="pref_camera2_noise_reduction_title">降噪</string>
   <string name="pref_camera2_noise_reduction_entry_off">關</string>
   <string name="pref_camera2_noise_reduction_entry_fast">快速</string>
@@ -447,10 +442,12 @@
   <string name="pref_camera2_videosnap_entry_enable">啟用</string>
   <string name="pref_camera2_videosnap_entry_disable">停用</string>
   <string name="pref_camera2_trackingfocus_title">追蹤對焦</string>
+  <string name="pref_camera2_trackingfocus_entry_off">關</string>
   <string name="pref_camera_scenemode_entry_bestpicture">最佳相片</string>
   <string name="bestpicture_done">完成</string>
   <string name="bestpicture_at_least_one_picture">至少需要一張圖片可供選擇。</string>
   <string name="pref_camera2_shutter_sound_entry_on">開</string>
   <string name="pref_camera2_shutter_sound_entry_off">關</string>
   <string name="pref_camera2_shutter_sound_title">快門音效</string>
+  <string name="pref_camera2_initial_camera_entry_mono">單色</string>
 </resources>
diff --git a/res/values-zu/qcomstrings.xml b/res/values-zu/qcomstrings.xml
index eb31e645f..5dc8931ef 100644
--- a/res/values-zu/qcomstrings.xml
+++ b/res/values-zu/qcomstrings.xml
@@ -85,7 +85,6 @@
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
-  <!-- Default mce setting. Do not translate. -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for HFR/HSR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for DIS mode -->
@@ -161,10 +160,6 @@
   <!-- Settings screen, Selectable HDR mode title -->
   <!-- Settings screen, Selectable HDR mode radio button choices -->
   <!-- HDR mode entry values. Do not translate. -->
-  <!-- Settings screen, Selectable HDR need 1x frame default value -->
-  <!-- Settings screen, Selectable HDR need 1x frame title -->
-  <!-- Settings screen, Selectable HDR need 1x frame radio button choices -->
-  <!-- HDR need 1x frame entry values. Do not translate. -->
   <!--Default video rotation setting-->
   <!--Settings screen, video rotation title-->
   <!--Menu, video rotation label-->
-- 
cgit v1.2.3