Automatic translation import

Change-Id: If8e111c42a4920e6388ab2fed8870f8202f0a336

46 files changed, 514 insertions, 172 deletions

diff --git a/quickReader/res/values-hr/strings.xml b/quickReader/res/values-hr/strings.xml
index 0039d5696..17f626951 100644
--- a/quickReader/res/values-hr/strings.xml
+++ b/quickReader/res/values-hr/strings.xml
@@ -16,16 +16,29 @@
 -->
 <resources>
   <!-- QuickReader: switcher item for qr -->
+  <string name="accessibility_switch_to_qr">QR čitač</string>
   <!-- QuickReader: dismiss button for dialogs -->
+  <string name="quick_reader_action_dismiss">Odbaci</string>
   <!-- QuickReader: toast shown when there's no app installed to open the qr code content -->
+  <string name="quick_reader_no_activity_found">Nema instaliranih aplikacija koje mogu otvoriti ovaj sadržaj</string>
   <!-- QuickReader: permission error dialog title -->
+  <string name="quick_reader_permission_error_title">Pogreška dopuštenja</string>
   <!-- QuickReader: permission error dialog message when permission can be asked again -->
+  <string name="quick_reader_permission_rationale_message">Potreban je pristup Kameri za skeniranje crtičnog koda</string>
   <!-- QuickReader: permission error dialog positive action when permission can be asked again -->
+  <string name="quick_reader_permission_rationale_positive">Pitaj ponovno</string>
   <!-- QuickReader: permission error dialog message when permission can't be asked again -->
+  <string name="quick_reader_permission_fatal_message">Pristup Kameri je odbijen. Omogućite ga u postavkama aplikacije</string>
   <!-- QuickReader: permission error dialog positive action when permission can't be asked again -->
+  <string name="quick_reader_permission_fatal_positive">Otvori postavke</string>
   <!-- QuickReader: scanned text dialog title -->
+  <string name="quick_reader_scanned_text_title">Skenirani tekst</string>
   <!-- QuickReader: scanned text dialog positive button (copy to clipboard) -->
+  <string name="quick_reader_scanned_text_positive">Kopiraj</string>
   <!-- QuickReader: scanned text dialog negative button (share) -->
+  <string name="quick_reader_scanned_text_negative">Podijeli</string>
   <!-- QuickReader: scanned text shared activity selector title -->
+  <string name="quick_reader_share_title">Podijeli pomoću\u2026</string>
   <!-- QuickReader: toast shown when the scanned text has been copied to the clipboard -->
+  <string name="quick_reader_copied_message">Kopirano u međuspremnik</string>
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 8f645fa4c..5ec3fdb08 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -29,11 +29,6 @@
   <!-- Details dialog "OK" button. Dismisses dialog. -->
   <string name="delete">Выдалiць</string>
   <!-- String Delete the selected media item(s) [CHAR LIMIT=50] -->
-  <plurals name="delete_selection">
-    <item quantity="one">Выдаліць абраны файл?</item>
-    <item quantity="few">Выдаліць абраныя файлы?</item>
-    <item quantity="other">Выдаліць абраныя файлы?</item>
-  </plurals>
   <string name="share">Падзяліцца</string>
   <string name="share_panorama">Падзяліцца панарамай</string>
   <string name="share_as_photo">Падзяліцца фотаздымкам</string>
@@ -45,25 +40,10 @@
   <string name="close">Зачыніць</string>
   <!-- String indicating how many media item(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
-  <plurals name="number_of_items_selected">
-    <item quantity="one">%1$d абраны</item>
-    <item quantity="few">%1$d абраны</item>
-    <item quantity="other">%1$d абраныя</item>
-  </plurals>
   <!-- String indicating how many media album(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
-  <plurals name="number_of_albums_selected">
-    <item quantity="one">%1$d абраны</item>
-    <item quantity="few">%1$d абраны</item>
-    <item quantity="other">%1$d абраныя</item>
-  </plurals>
   <!-- String indicating how many media group(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
-  <plurals name="number_of_groups_selected">
-    <item quantity="one">%1$d абраны</item>
-    <item quantity="few">%1$d абраны</item>
-    <item quantity="other">%1$d абраныя</item>
-  </plurals>
   <!-- String indicating timestamp of photo or video -->
   <string name="show_on_map">Паказаць на мапе</string>
   <string name="rotate_left">Павярнуць налева</string>
@@ -174,11 +154,6 @@
   <!-- Title for countdown timer on camera settings screen [CHAR LIMIT=30]-->
   <string name="pref_camera_timer_title">Аўтаспуск</string>
   <!-- Entry for countdown timer setting. e.g. 1 second, 10 seconds, etc. [CHAR LIMIT=30]-->
-  <plurals name="pref_camera_timer_entry">
-    <item quantity="one">1 секунда</item>
-    <item quantity="few">%d секунды</item>
-    <item quantity="other">%d секундаў</item>
-  </plurals>
   <!-- Text followed by a checkbox to turn on/off sound effects during the countdown. [CHAR LIMIT = 24]-->
   <string name="pref_camera_timer_sound_title">Гукавы сігнал падчас зваротнага адліку</string>
   <!-- Entry of camera save path -->
diff --git a/res/values-bg/qcomstrings.xml b/res/values-bg/qcomstrings.xml
index 0a7c6da82..564c3d358 100644
--- a/res/values-bg/qcomstrings.xml
+++ b/res/values-bg/qcomstrings.xml
@@ -484,6 +484,7 @@
   <string name="pref_camera2_scene_mode_sharp_photo_instructional_content">Sharp photo намалява замъгляването, което се дължи на движението в сцената или на ръчното движение.</string>
   <string name="pref_camera2_scene_mode_tracking_focus_instructional_content">Позволява ви да следите и фокусирате избран човек или обект, докато правите снимки или видеоклипове. За да започнете, поставете правоъгълника на фокуса върху човек или обект, който искате да проследите.</string>
   <string name="pref_camera2_scene_mode_time_lapse_instructional_content">С Time lapse можете да превърнете дълъг видеозапис в няколко секунди от видеоклипа. Този ефект се отнася за видеоклипове, но не за снимки.</string>
+  <string name="pref_camera2_scene_mode_panorama_instructional_content">Позволява ви да превъртите наляво или надясно, за да направите широка пейзажна снимка. Можете да използвате панорамиране нагоре или надолу, за да заснемате по-високи изображения.</string>
   <string name="pref_camera2_scene_mode_blur_buster_instructional_content">BlurBuster намалява размазването от нестабилни ръце. Тя може да бъде полезна, когато правите снимки при тежки условия.</string>
   <string name="pref_camera2_scene_mode_pro_instructional_content">При Професионален режим можете ръчно да управлявате настройките за ISO, експонация, баланс на бялото и фокус. Ще имате лесен достъп до всички тези разширени настройки</string>
   <string name="pref_camera2_not_show_again">Не показвай отново</string>
@@ -548,6 +549,7 @@
   <string name="pref_camera2_zsl_entry_hal_zsl">Хардуер ZSL</string>
   <!-- QCFA Title -->
   <!-- QCFA choices -->
+  <string name="pref_camera2_switch_camera_title">Превключване на камера чрез ID</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>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 4399fe5a7..d587828b8 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -558,9 +558,17 @@ CHAR LIMIT = NONE] -->
   <string name="pref_camera2_category_system">Система</string>
   <string name="pref_camera2_restore_default">Възстанови по подразбиране</string>
   <string name="pref_camera2_restore_default_hint">Настройките на камерата ще бъдат възстановени до първоначалните настройки</string>
+  <plurals name="save_best_dialog_content">
+    <item quantity="one">%1$d от 10 изображения ще бъдат записани а останалите ще бъдат изтрити</item>
+    <item quantity="other">%1$d от 10 снимки ще бъдат записани а останалите ще бъдат изтрити</item>
+  </plurals>
   <string name="save_best_dialog_title">Да запиша ли избраните изображения?</string>
   <string name="save_best_dialog_positive_bt">Добре</string>
   <string name="save_best_dialog_native_bt">Отказ</string>
+  <plurals name="save_best_image_toast">
+    <item quantity="one">%1$d от 10 снимки записани.</item>
+    <item quantity="other">%1$d от 10 снимки записани.</item>
+  </plurals>
   <string name="dialog_do_not_show">Не показвай отново</string>
   <string name="delete_best_dialog_title">Да изтрия ли всички?</string>
   <string name="delete_best_dialog_content">Наистина ли искате да изтриете всички 10 снимки?</string>
diff --git a/res/values-ca/qcomstrings.xml b/res/values-ca/qcomstrings.xml
index de80ee5dc..3e0d7cec4 100644
--- a/res/values-ca/qcomstrings.xml
+++ b/res/values-ca/qcomstrings.xml
@@ -484,6 +484,7 @@
   <string name="pref_camera2_scene_mode_sharp_photo_instructional_content">Fotografia nítida redueix el desenfoc provocat pel moviment de l\'escena, o provocat pel moviment de la mà.</string>
   <string name="pref_camera2_scene_mode_tracking_focus_instructional_content">Et permet rastrejar i enfocar a una persona o objecte seleccionat metre fas fotos o vídeos. Per començar, col·loca el rectangle d\'enfocament en una persona o objecte que desitgis rastrejar.</string>
   <string name="pref_camera2_scene_mode_time_lapse_instructional_content">Amb la filmació a intervals, podeu transformar un enregistrament de vídeo llarg en uns pocs segons de vídeo. Aquest efecte s\'aplica als vídeos, però no a les fotos.</string>
+  <string name="pref_camera2_scene_mode_panorama_instructional_content">Et permet desplaçar-te cap a l\'esquerra o cap a la dreta per fer una foto panoràmica àmplia. També pots fer una panoràmica cap amunt o cap avall per fer fotos altes.</string>
   <string name="pref_camera2_scene_mode_blur_buster_instructional_content">BlurBuster redueix la borrositat de les mans tremoloses. Pot ser útil al fer fotos en llocs difícils.</string>
   <string name="pref_camera2_scene_mode_pro_instructional_content">Amb el mode pro, podeu controlar manualment els paràmetres d\'ISO, exposició, balanç de blancs i enfocament. Tindreu fàcil accés a totes aquestes configuracions avançades</string>
   <string name="pref_camera2_not_show_again">No ho tornis a mostrar</string>
@@ -548,6 +549,7 @@
   <string name="pref_camera2_zsl_entry_hal_zsl">Maquinari ZSL</string>
   <!-- QCFA Title -->
   <!-- QCFA choices -->
+  <string name="pref_camera2_switch_camera_title">Canvia la càmera per ID</string>
   <string name="pref_camera2_initial_camera_entry_bayer">Bayer</string>
   <string name="pref_camera2_initial_camera_entry_mono">Mono</string>
   <string name="pref_camera2_initial_camera_entry_front">Frontal</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 1b88458d5..9dfad7df7 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -558,9 +558,17 @@ CHAR LIMIT = NONE] -->
   <string name="pref_camera2_category_system">Sistema</string>
   <string name="pref_camera2_restore_default">Restaura els valors predeterminats</string>
   <string name="pref_camera2_restore_default_hint">La configuració de la càmera es restaurarà a la configuració per defecte</string>
+  <plurals name="save_best_dialog_content">
+    <item quantity="one">Es desarà %1$d de 10 imatges i la resta s\'eliminarà</item>
+    <item quantity="other">Es desaran %1$d de 10 imatges i la resta s\'eliminarà</item>
+  </plurals>
   <string name="save_best_dialog_title">Vols desar les imatges seleccionades?</string>
   <string name="save_best_dialog_positive_bt">D\'ACORD</string>
   <string name="save_best_dialog_native_bt">Cancel·la</string>
+  <plurals name="save_best_image_toast">
+    <item quantity="one">S\'ha desat %1$d de 10 imatges.</item>
+    <item quantity="other">S\'han desat %1$d de 10 imatges.</item>
+  </plurals>
   <string name="dialog_do_not_show">No ho tornis a mostrar</string>
   <string name="delete_best_dialog_title">Esborrar-ho tot?</string>
   <string name="delete_best_dialog_content">Estàs segur que vols suprimir les 10 imatges fetes?</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 8f478ef01..72f51d77b 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -29,11 +29,6 @@
   <!-- Details dialog "OK" button. Dismisses dialog. -->
   <string name="delete">Smazat</string>
   <!-- String Delete the selected media item(s) [CHAR LIMIT=50] -->
-  <plurals name="delete_selection">
-    <item quantity="one">Smazat vybranou položku?</item>
-    <item quantity="few">Smazat vybrané položky?</item>
-    <item quantity="other">Smazat vybrané položky?</item>
-  </plurals>
   <string name="share">Sdílet</string>
   <string name="share_panorama">Sdílet panorama</string>
   <string name="share_as_photo">Sdílet jako fotku</string>
@@ -45,25 +40,10 @@
   <string name="close">Zavřít</string>
   <!-- String indicating how many media item(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
-  <plurals name="number_of_items_selected">
-    <item quantity="one">%1$d vybrán</item>
-    <item quantity="few">%1$d vybrány</item>
-    <item quantity="other">%1$d vybraných</item>
-  </plurals>
   <!-- String indicating how many media album(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
-  <plurals name="number_of_albums_selected">
-    <item quantity="one">%1$d vybráno</item>
-    <item quantity="few">%1$d vybrány</item>
-    <item quantity="other">%1$d vybraných</item>
-  </plurals>
   <!-- String indicating how many media group(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
-  <plurals name="number_of_groups_selected">
-    <item quantity="one">%1$d vybrána</item>
-    <item quantity="few">%1$d vybrány</item>
-    <item quantity="other">%1$d vybraných</item>
-  </plurals>
   <!-- String indicating timestamp of photo or video -->
   <string name="show_on_map">Zobrazit na mapě</string>
   <string name="rotate_left">Otočit doleva</string>
@@ -175,11 +155,6 @@
   <!-- Title for countdown timer on camera settings screen [CHAR LIMIT=30]-->
   <string name="pref_camera_timer_title">Časovač odpočítávání</string>
   <!-- Entry for countdown timer setting. e.g. 1 second, 10 seconds, etc. [CHAR LIMIT=30]-->
-  <plurals name="pref_camera_timer_entry">
-    <item quantity="one">1 s</item>
-    <item quantity="few">%d s</item>
-    <item quantity="other">%d s</item>
-  </plurals>
   <!-- Text followed by a checkbox to turn on/off sound effects during the countdown. [CHAR LIMIT = 24]-->
   <string name="pref_camera_timer_sound_title">Zvuk při odpočtu</string>
   <!-- Entry of camera save path -->
diff --git a/res/values-en-rAU/qcomstrings.xml b/res/values-en-rAU/qcomstrings.xml
index d7e2c8ae4..c90ad3bb5 100644
--- a/res/values-en-rAU/qcomstrings.xml
+++ b/res/values-en-rAU/qcomstrings.xml
@@ -485,6 +485,7 @@
   <string name="pref_camera2_scene_mode_sharp_photo_instructional_content">Sharp photo reduces blur that is due to motion in the scene, or due to hand motion.</string>
   <string name="pref_camera2_scene_mode_tracking_focus_instructional_content">Allows you to track and focus a selected person or object while taking pictures or videos. To start, position the focus rectangle on a person or object you want to track.</string>
   <string name="pref_camera2_scene_mode_time_lapse_instructional_content">With Time lapse, you can transform a long video recording into a few seconds of video. This effect applies to videos, but not photos.</string>
+  <string name="pref_camera2_scene_mode_panorama_instructional_content">Allows you to pan left or right to take a wide landscape photo. You can also pan up or down to take tall photos.</string>
   <string name="pref_camera2_scene_mode_blur_buster_instructional_content">BlurBuster reduces blur from shaky hands. It can be helpful when taking photos in difficult places.</string>
   <string name="pref_camera2_scene_mode_pro_instructional_content">With Pro mode, you can manually control settings for ISO, exposure, white balance, and focus. You will have easy access to all of these advanced settings</string>
   <string name="pref_camera2_not_show_again">Do not show again</string>
@@ -549,6 +550,7 @@
   <string name="pref_camera2_zsl_entry_hal_zsl">Hardware ZSL</string>
   <!-- QCFA Title -->
   <!-- QCFA choices -->
+  <string name="pref_camera2_switch_camera_title">Switch camera by ID</string>
   <string name="pref_camera2_initial_camera_entry_bayer">Bayer</string>
   <string name="pref_camera2_initial_camera_entry_mono">Mono</string>
   <string name="pref_camera2_initial_camera_entry_front">Front</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 1b23e0130..af29fb225 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -556,9 +556,17 @@ CHAR LIMIT = NONE] -->
   <string name="pref_camera2_category_system">System</string>
   <string name="pref_camera2_restore_default">Restore defaults</string>
   <string name="pref_camera2_restore_default_hint">Camera settings will be restored to default settings</string>
+  <plurals name="save_best_dialog_content">
+    <item quantity="one">%1$d of 10 images will be saved and the rest will be deleted</item>
+    <item quantity="other">%1$d of 10 images will be saved and the rest will be deleted</item>
+  </plurals>
   <string name="save_best_dialog_title">Save selected images?</string>
   <string name="save_best_dialog_positive_bt">OK</string>
   <string name="save_best_dialog_native_bt">Cancel</string>
+  <plurals name="save_best_image_toast">
+    <item quantity="one">%1$d of 10 images saved.</item>
+    <item quantity="other">%1$d of 10 images saved.</item>
+  </plurals>
   <string name="dialog_do_not_show">Do not show again</string>
   <string name="delete_best_dialog_title">Delete all?</string>
   <string name="delete_best_dialog_content">Are you sure you want to delete all 10 pictures taken?</string>
diff --git a/res/values-en-rGB/qcomstrings.xml b/res/values-en-rGB/qcomstrings.xml
index 7b6fcb3b1..72835f78b 100644
--- a/res/values-en-rGB/qcomstrings.xml
+++ b/res/values-en-rGB/qcomstrings.xml
@@ -484,6 +484,7 @@
   <string name="pref_camera2_scene_mode_sharp_photo_instructional_content">Sharp photo reduces blur that is due to motion in the scene, or due to hand motion.</string>
   <string name="pref_camera2_scene_mode_tracking_focus_instructional_content">Allows you to track and focus a selected person or object while taking pictures or videos. To start, position the focus rectangle on a person or object you want to track.</string>
   <string name="pref_camera2_scene_mode_time_lapse_instructional_content">With Time lapse, you can transform a long video recording into a few seconds of video. This effect applies to videos, but not photos.</string>
+  <string name="pref_camera2_scene_mode_panorama_instructional_content">Allows you to pan left or right to take a wide landscape photo. You can also pan up or down to take tall photos.</string>
   <string name="pref_camera2_scene_mode_blur_buster_instructional_content">BlurBuster reduces blur from shaky hands. It can be helpful when taking photos in difficult places.</string>
   <string name="pref_camera2_scene_mode_pro_instructional_content">With Pro mode, you can manually control settings for ISO, exposure, white balance, and focus. You will have easy access to all of these advanced settings</string>
   <string name="pref_camera2_not_show_again">Do not show again</string>
@@ -548,6 +549,7 @@
   <string name="pref_camera2_zsl_entry_hal_zsl">Hardware ZSL</string>
   <!-- QCFA Title -->
   <!-- QCFA choices -->
+  <string name="pref_camera2_switch_camera_title">Switch camera by ID</string>
   <string name="pref_camera2_initial_camera_entry_bayer">Bayer</string>
   <string name="pref_camera2_initial_camera_entry_mono">Mono</string>
   <string name="pref_camera2_initial_camera_entry_front">Front</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index e01062805..573251b6c 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -556,9 +556,17 @@ CHAR LIMIT = NONE] -->
   <string name="pref_camera2_category_system">System</string>
   <string name="pref_camera2_restore_default">Restore defaults</string>
   <string name="pref_camera2_restore_default_hint">Camera settings will be restored to default settings</string>
+  <plurals name="save_best_dialog_content">
+    <item quantity="one">%1$d of 10 images will be saved and the rest will be deleted</item>
+    <item quantity="other">%1$d of 10 images will be saved and the rest will be deleted</item>
+  </plurals>
   <string name="save_best_dialog_title">Save selected images?</string>
   <string name="save_best_dialog_positive_bt">OK</string>
   <string name="save_best_dialog_native_bt">Cancel</string>
+  <plurals name="save_best_image_toast">
+    <item quantity="one">%1$d of 10 images saved.</item>
+    <item quantity="other">%1$d of 10 images saved.</item>
+  </plurals>
   <string name="dialog_do_not_show">Do not show again</string>
   <string name="delete_best_dialog_title">Delete all?</string>
   <string name="delete_best_dialog_content">Are you sure you want to delete all 10 pictures taken?</string>
diff --git a/res/values-en-rIN/qcomstrings.xml b/res/values-en-rIN/qcomstrings.xml
index 6aaad42dc..32a5ed549 100644
--- a/res/values-en-rIN/qcomstrings.xml
+++ b/res/values-en-rIN/qcomstrings.xml
@@ -485,6 +485,7 @@
   <string name="pref_camera2_scene_mode_sharp_photo_instructional_content">Sharp photo reduces blur that is due to motion in the scene, or due to hand motion.</string>
   <string name="pref_camera2_scene_mode_tracking_focus_instructional_content">Allows you to track and focus a selected person or object while taking pictures or videos. To start, position the focus rectangle on a person or object you want to track.</string>
   <string name="pref_camera2_scene_mode_time_lapse_instructional_content">With Time lapse, you can transform a long video recording into a few seconds of video. This effect applies to videos, but not photos.</string>
+  <string name="pref_camera2_scene_mode_panorama_instructional_content">Allows you to pan left or right to take a wide landscape photo. You can also pan up or down to take tall photos.</string>
   <string name="pref_camera2_scene_mode_blur_buster_instructional_content">BlurBuster reduces blur from shaky hands. It can be helpful when taking photos in difficult places.</string>
   <string name="pref_camera2_scene_mode_pro_instructional_content">With Pro mode, you can manually control settings for ISO, exposure, white balance, and focus. You will have easy access to all of these advanced settings</string>
   <string name="pref_camera2_not_show_again">Do not show again</string>
@@ -549,6 +550,7 @@
   <string name="pref_camera2_zsl_entry_hal_zsl">Hardware ZSL</string>
   <!-- QCFA Title -->
   <!-- QCFA choices -->
+  <string name="pref_camera2_switch_camera_title">Switch camera by ID</string>
   <string name="pref_camera2_initial_camera_entry_bayer">Bayer</string>
   <string name="pref_camera2_initial_camera_entry_mono">Mono</string>
   <string name="pref_camera2_initial_camera_entry_front">Front</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 2d8986489..445c9d95e 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -556,9 +556,17 @@ CHAR LIMIT = NONE] -->
   <string name="pref_camera2_category_system">System</string>
   <string name="pref_camera2_restore_default">Restore defaults</string>
   <string name="pref_camera2_restore_default_hint">Camera settings will be restored to default settings</string>
+  <plurals name="save_best_dialog_content">
+    <item quantity="one">%1$d of 10 images will be saved and the rest will be deleted</item>
+    <item quantity="other">%1$d of 10 images will be saved and the rest will be deleted</item>
+  </plurals>
   <string name="save_best_dialog_title">Save selected images?</string>
   <string name="save_best_dialog_positive_bt">OK</string>
   <string name="save_best_dialog_native_bt">Cancel</string>
+  <plurals name="save_best_image_toast">
+    <item quantity="one">%1$d of 10 images saved.</item>
+    <item quantity="other">%1$d of 10 images saved.</item>
+  </plurals>
   <string name="dialog_do_not_show">Do not show again</string>
   <string name="delete_best_dialog_title">Delete all?</string>
   <string name="delete_best_dialog_content">Are you sure you want to delete all 10 pictures taken?</string>
diff --git a/res/values-es-rUS/qcomstrings.xml b/res/values-es-rUS/qcomstrings.xml
index f635864e9..74f8c1227 100644
--- a/res/values-es-rUS/qcomstrings.xml
+++ b/res/values-es-rUS/qcomstrings.xml
@@ -484,6 +484,7 @@
   <string name="pref_camera2_scene_mode_sharp_photo_instructional_content">La fotografía nítida reduce la borrosidad que se debe al movimiento en la escena o al movimiento de la mano.</string>
   <string name="pref_camera2_scene_mode_tracking_focus_instructional_content">Permite el seguimiento y enfoque de un objeto o persona seleccionada mientras toma fotos o videos. Para iniciar, coloca el rectángulo de enfoque en la persona u objeto que desees seguir.</string>
   <string name="pref_camera2_scene_mode_time_lapse_instructional_content">Con Time lapse, puedes transformar una grabación de video larga en unos segundos de video. Este efecto se aplica a los videos, pero no a las fotos.</string>
+  <string name="pref_camera2_scene_mode_panorama_instructional_content">Permite desplazarse a la izquierda o a la derecha para fotografiar un paisaje amplio. Puede desplazarse hacia arriba o hacia abajo para tomar grandes fotos.</string>
   <string name="pref_camera2_scene_mode_blur_buster_instructional_content">BlurBuster reduce el desenfoque debido a las manos temblorosas. Puede ser útil al tomar fotos en lugares difíciles.</string>
   <string name="pref_camera2_scene_mode_pro_instructional_content">Con el modo Pro, puedes controlar manualmente los ajustes de ISO, exposición, balance de blancos y enfoque. Tendrás fácil acceso a todos estos ajustes avanzados</string>
   <string name="pref_camera2_not_show_again">No volver a mostrar</string>
@@ -548,6 +549,7 @@
   <string name="pref_camera2_zsl_entry_hal_zsl">Hardware ZSL</string>
   <!-- QCFA Title -->
   <!-- QCFA choices -->
+  <string name="pref_camera2_switch_camera_title">Alternar cámara por ID</string>
   <string name="pref_camera2_initial_camera_entry_bayer">Bayer</string>
   <string name="pref_camera2_initial_camera_entry_mono">Mono</string>
   <string name="pref_camera2_initial_camera_entry_front">Frontal</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index fb9dc4e39..237a9671b 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -555,9 +555,17 @@ CHAR LIMIT = NONE] -->
   <string name="pref_camera2_category_system">Sistema</string>
   <string name="pref_camera2_restore_default">Restaurar predefinidos</string>
   <string name="pref_camera2_restore_default_hint">Los ajustes de la cámara se restaurarán a los ajustes predefinidos</string>
+  <plurals name="save_best_dialog_content">
+    <item quantity="one">Se guardará %1$d de las 10 imágenes, el resto se borrará</item>
+    <item quantity="other">Se guardarán %1$d de las 10 imágenes, el resto se borrará</item>
+  </plurals>
   <string name="save_best_dialog_title">¿Guardar imágenes seleccionadas?</string>
   <string name="save_best_dialog_positive_bt">Aceptar</string>
   <string name="save_best_dialog_native_bt">Cancelar</string>
+  <plurals name="save_best_image_toast">
+    <item quantity="one">Guardada %1$d de 10 imágenes.</item>
+    <item quantity="other">Guardadas %1$d de 10 imágenes.</item>
+  </plurals>
   <string name="dialog_do_not_show">No volver a mostrar</string>
   <string name="delete_best_dialog_title">¿Borrar todo?</string>
   <string name="delete_best_dialog_content">¿Seguro de que quieres borrar las 10 fotos tomadas?</string>
diff --git a/res/values-eu/qcomstrings.xml b/res/values-eu/qcomstrings.xml
index d65a9b6a7..2c15d8548 100644
--- a/res/values-eu/qcomstrings.xml
+++ b/res/values-eu/qcomstrings.xml
@@ -450,15 +450,46 @@
   <string name="pref_camera2_trackingfocus_entry_on">Bai</string>
   <string name="pref_camera2_trackingfocus_entry_off">Ez</string>
   <string name="pref_camera_scenemode_entry_bestpicture">Argazkirik onena</string>
+  <string name="pref_camera_scenemode_entry_sharpshooter">Fokatu argazkia</string>
   <string name="pref_camera_scenemode_entry_trackingfocus">Fokua jarraitzen</string>
+  <string name="pref_camera_scenemode_entry_panorama">Panorama</string>
+  <string name="pref_camera_scenemode_entry_promode">Pro modua</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_timer_entry_off">Ez</string>
+  <string name="pref_camera2_timer_entry_2sec">2 segundo</string>
+  <string name="pref_camera2_timer_entry_5sec">5 segundo</string>
+  <string name="pref_camera2_timer_entry_10sec">10 segundo</string>
+  <string name="pref_camera2_saveraw_title">Gorde Raw formatuan</string>
+  <string name="panocapture_direction_is_not_determined">Mugitu etengabe norabide berean.</string>
+  <string name="panocapture_intro">Sakatu kamera botoia hasteko.</string>
+  <string name="panocapture_direction_is_changed">Norabidea aldatu da, panoramaren kaptura gelditzen\u2026</string>
+  <string name="makeup_ui_title">Hautatu edertzearen indarra.</string>
   <string name="makeup_ui_ok_button">ADOS</string>
+  <string name="perf_camera2_version_info">Bertsioaren informazioa</string>
+  <string name="perf_camera2_preferences_category_general">Orokorra</string>
+  <string name="perf_camera2_preferences_category_photo">Kamera geldia</string>
+  <string name="perf_camera2_preferences_category_video">Bideo kamera</string>
+  <string name="perf_camera2_preferences_category_system">Sistema</string>
+  <string name="pref_camera2_scene_mode_dual_camera_instructional_content">Kamera duala moduan zure argazkiak garbiagoak izango dira. Atzealdeko efektuak aplikatu ditzakezu ere, zure kamera dualeko argazkiak galerian editatuz.</string>
+  <string name="pref_camera2_scene_mode_ubi_focus_instructional_content">UbiFocus-ekin, zure kamerak bost argazki aterako ditu eta bostak dena fokuan duen argazki bakarrean batu. Argazkia atera eta gero fokua aldatu dezakezu.</string>
+  <string name="pref_camera2_scene_mode_opti_zoom_instructional_content">Erabili OptiZoom argazki garbi baterako zoom egin nahi duzunean. Zoom-a argazkia atera aurretik edo atera eta gero erabili dezakezu.</string>
+  <string name="pref_camera2_scene_mode_sports_instructional_content">Kirol moduak akziozko argazki hobeak ateratzen laguntzen dizu.\n\nArgazkiak hobetzen ditu baina ez du efekturik bideo grabaketan.</string>
+  <string name="pref_camera2_scene_mode_hdr_instructional_content">Argi nahasia dagoen egoeratan, argi gutxi eta atzealde argitua esaterako, hautatu \"HDR\" ahal den argazki onena lortzeko.</string>
+  <string name="pref_camera2_scene_mode_best_photo_instructional_content">10 argazki jarraian ateratzea ahalbidetzen du, gero onena(k) aukeratzea zure esku.</string>
+  <string name="pref_camera2_scene_mode_chroma_flash_instructional_content">ChromaFlash-ekin, flash-a erabilitako argazkietako argia argazkiko pertsona eta objektu guztientzat optimizatuko da. Hau atzealdeko kameran besterik ez da erabiltzen.</string>
+  <string name="pref_camera2_scene_mode_sharp_photo_instructional_content">Fokatu argazkiak eszenako mugimenduak edo eskuaren mugimenduak sortutako lausotzea murrizten du.</string>
+  <string name="pref_camera2_scene_mode_tracking_focus_instructional_content">Hautatutako pertsona jarraitu eta fokuan mantentzea ahalbidetzen dizu argazkiak edo bideoak ateratzean. Hasteko, kokatu fokuaren laukia jarraitu nahi duzun pertsona edo objektuan.</string>
+  <string name="pref_camera2_scene_mode_time_lapse_instructional_content">Time lapse erabiliz, grabazio luze bat segundo gutxi batzuetako bideoa bihurtu dezakezu. Honek bideoetarako balio du, ez argazkietarako.</string>
+  <string name="pref_camera2_scene_mode_panorama_instructional_content">Argazki zabal bat ateratzeko, kamera ezkerrera edo eskumara mugitzea ahalbidetzen dizu. Gora edo behera mugitu dezakezu ere argazki luze bat ateratzeko.</string>
+  <string name="pref_camera2_scene_mode_blur_buster_instructional_content">BlurBuster-ek esku dardartien lausotzea murrizten du. Argazkiak toki zailetan ateratzean lagungarria izan daiteke.</string>
+  <string name="pref_camera2_scene_mode_pro_instructional_content">Pro moduan, eskuz kontrolatu ditzakezu ISO, esposizio, zuri balantze eta fokuaren ezarpenak. Ezarpen aurreratu guzti hauetara sarbide erraza izango duzu</string>
+  <string name="pref_camera2_not_show_again">Ez erakutsi berriro</string>
   <string name="pref_camera2_scene_mode_instructional_ok">ADOS</string>
+  <string name="pref_camera2_instant_aec_title">Berehalako AEC</string>
   <string name="pref_camera2_instant_aec_entry_disable">Desgaitu</string>
   <string name="pref_camera2_instant_aec_entry_aggressive">AEC erasokorra</string>
   <string name="pref_camera2_instant_aec_entry_fast">AEC bizkorra</string>
@@ -482,24 +513,43 @@
   <string name="pref_camera2_histogram_title">Histograma</string>
   <string name="pref_camera2_histogram_entry_enable">Gaitu</string>
   <string name="pref_camera2_histogram_entry_disable">Desgaitu</string>
+  <string name="pref_camera2_hdr_title">HDR</string>
   <string name="pref_camera2_hdr_entry_enable">Gaitu</string>
   <string name="pref_camera2_hdr_entry_disable">Desgaitu</string>
   <string name="pref_camera2_auto_hdr_title">HDR automatikoa</string>
   <string name="pref_camera2_auto_hdr_entry_enable">Gaitu</string>
   <string name="pref_camera2_auto_hdr_entry_disable">Desgaitu</string>
+  <string name="pref_camera_bokeh_mode_title">Bokeh modua</string>
   <string name="pref_camera_bokeh_mode_entry_enable">Gaitu</string>
   <string name="pref_camera_bokeh_mode_entry_disable">Desgaitu</string>
+  <string name="pref_camera_bokeh_mpo_title">Bokeh moduaren MPO</string>
   <string name="pref_camera_bokeh_mpo_entry_enable">Gaitu</string>
   <string name="pref_camera_bokeh_mpo_entry_disable">Desgaitu</string>
+  <string name="pref_camera_bokeh_blur_degree_title">Bokeh lausotze balioa</string>
   <!-- Default Zoom setting. -->
+  <string name="pref_camera_zoom_title">Zooma</string>
   <!-- Settings menu, Zoom choices -->
   <string name="pref_camera_zoom_entry_off">Ez</string>
+  <string name="pref_camera_zoom_entry_1x">1x</string>
+  <string name="pref_camera_zoom_entry_2x">2x</string>
+  <string name="pref_camera_zoom_entry_3x">3x</string>
+  <string name="pref_camera_zoom_entry_4x">4x</string>
+  <string name="pref_camera_zoom_entry_5x">5x</string>
+  <string name="pref_camera_zoom_entry_6x">6x</string>
+  <string name="pref_camera_zoom_entry_7x">7x</string>
+  <string name="pref_camera_zoom_entry_8x">8x</string>
+  <string name="pref_camera_zoom_entry_9x">9x</string>
+  <string name="pref_camera_zoom_entry_10x">10x</string>
+  <string name="pref_camera2_bsgc_title">Irribarre/kliska/begirada antzematea</string>
   <string name="pref_camera2_bsgc_entry_enable">Gaitu</string>
   <string name="pref_camera2_bsgc_entry_disable">Desgaitu</string>
   <string name="pref_camera2_zsl_title">Atzerapenik gabeko obturadorea</string>
   <string name="pref_camera2_zsl_entry_disable">Ez</string>
+  <string name="pref_camera2_zsl_entry_app_zsl">Software bidezko ZSL</string>
+  <string name="pref_camera2_zsl_entry_hal_zsl">Hardware bidezko ZSL</string>
   <!-- QCFA Title -->
   <!-- QCFA choices -->
+  <string name="pref_camera2_switch_camera_title">Txandakatu kamera ID-aren arabera</string>
   <string name="pref_camera2_initial_camera_entry_bayer">Bayer</string>
   <string name="pref_camera2_initial_camera_entry_mono">Mono</string>
   <string name="pref_camera2_initial_camera_entry_front">Aurrekoa</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 45a569f7c..7a195d9fe 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -395,6 +395,7 @@ Elementua gailuan gorde da eta konexiorik gabe erabili daiteke.</string>
   <!-- The shutter button. [CHAR LIMIT = NONE] -->
   <string name="accessibility_shutter_button">Obturadorea</string>
   <!-- The exit best photo mode button. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_exit_best_mode_button">Irten argazki onena modutik</string>
   <!-- The menu button. [CHAR LIMIT = NONE] -->
   <string name="accessibility_menu_button">Menu botoia</string>
   <!-- The mode picker to switch between camera, video and panorama. [CHAR LIMIT = NONE] -->
@@ -552,6 +553,30 @@ CHAR LIMIT = NONE] -->
   <!-- Menu, Video rotation labels [CHAR LIMIT=50] -->
   <string name="remaining_photos_format">%d geratzen dira</string>
   <string name="makeup_video_size_limit">Makillaje moduak VGA tamainako bideo grabaketan soilik funtzionatzen du.</string>
+  <string name="pref_camera2_category_system">Sistema</string>
+  <string name="pref_camera2_restore_default">Berrezarri balio lehenetsiak</string>
+  <string name="pref_camera2_restore_default_hint">Kameraren ezarpenak lehenetsitako ezarpenetara berrezarriko dira</string>
+  <plurals name="save_best_dialog_content">
+    <item quantity="one">10etik irudi %1$d gordeko da, besteak ezabatuko dira</item>
+    <item quantity="other">10etik %1$d irudi gordeko dira, besteak ezabatuko dira</item>
+  </plurals>
+  <string name="save_best_dialog_title">Gorde hautatutako irudiak?</string>
   <string name="save_best_dialog_positive_bt">ADOS</string>
+  <string name="save_best_dialog_native_bt">Utzi</string>
+  <plurals name="save_best_image_toast">
+    <item quantity="one">10etik irudi %1$d gorde da.</item>
+    <item quantity="other">10etik %1$d irudi gorde dira.</item>
+  </plurals>
+  <string name="dialog_do_not_show">Ez erakutsi berriro</string>
+  <string name="delete_best_dialog_title">Ezabatu guztiak?</string>
+  <string name="delete_best_dialog_content">Ziur hartutako 10 irudiak ezabatu nahi dituzula?</string>
+  <string name="delete_best_dialog_native_bt">Utzi</string>
   <string name="delete_best_dialog_positive_bt">Ezabatu</string>
+  <string name="delete_all_best_dialog_title">Ezabatu guztiak?</string>
+  <string name="delete_all_best_dialog_content">Ziur irudi guztiak ezabatu nahi dituzula?</string>
+  <string name="delete_all_best_dialog_native_bt">Utzi</string>
+  <string name="delete_all_best_dialog_positive_bt">Ezabatu guztiak</string>
+  <string name="overflow_best_item1">Gorde denak</string>
+  <string name="overflow_best_item2">Ezabatu guztiak</string>
+  <string name="settings_title">Ezarpenak</string>
 </resources>
diff --git a/res/values-fr/qcomstrings.xml b/res/values-fr/qcomstrings.xml
index fceaa56b7..ee78ed3fa 100644
--- a/res/values-fr/qcomstrings.xml
+++ b/res/values-fr/qcomstrings.xml
@@ -452,6 +452,7 @@
   <string name="pref_camera_scenemode_entry_bestpicture">Image optimale</string>
   <string name="pref_camera_scenemode_entry_trackingfocus">Mise au point automatique par suivi du sujet</string>
   <string name="pref_camera_scenemode_entry_panorama">Panorama</string>
+  <string name="pref_camera_scenemode_entry_promode">Mode Pro</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>
@@ -463,6 +464,9 @@
   <string name="pref_camera2_timer_entry_10sec">10 secondes</string>
   <string name="makeup_ui_ok_button">OK</string>
   <string name="perf_camera2_version_info">Informations de version</string>
+  <string name="perf_camera2_preferences_category_general">Générale</string>
+  <string name="perf_camera2_preferences_category_photo">Appareil photo</string>
+  <string name="perf_camera2_preferences_category_video">Caméra vidéo</string>
   <string name="perf_camera2_preferences_category_system">Système</string>
   <string name="pref_camera2_not_show_again">Ne plus afficher</string>
   <string name="pref_camera2_scene_mode_instructional_ok">OK</string>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index d9487023d..71e90684d 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -23,6 +23,7 @@
          parameter two is size in megapixels, e.g. "(4:3) 12.1 megapixels"
          NOTE: for Chinese (zh) and Korean (ko) the pixel number (parameter two)
          will be multiplied by 100 as those languages want to count by ten thousands -->
+  <string name="pref_camera_megapixel_format">(<xliff:g id="ratio" example="16:9">%1$s</xliff:g>) <xliff:g id="pixels">%2$1.1f</xliff:g> megapixela</string>
   <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_antimotionblur">Redukcija zamagljenja zbog gibanja</string>
   <string name="pref_camera_scenemode_entry_aqua">Aqua</string>
@@ -46,6 +47,7 @@
   <string name="pref_camera_scenemode_entry_fireworks">Vatromet</string>
   <string name="pref_camera_scenemode_entry_flowers">Cvijeće</string>
   <string name="pref_camera_scenemode_entry_handheldtwilight">Sumrak (držano rukama)</string>
+  <string name="pref_camera_scenemode_entry_highsensitivity">Visoka osjetljivost</string>
   <string name="pref_camera_scenemode_entry_indoor">Unutarnje</string>
   <string name="pref_camera_scenemode_entry_landscape">Krajolik</string>
   <string name="pref_camera_scenemode_entry_mix_illuminant">Mješovita rasvjeta</string>
diff --git a/res/values-hr/qcomstrings.xml b/res/values-hr/qcomstrings.xml
index 6b16a4490..1738a38c7 100644
--- a/res/values-hr/qcomstrings.xml
+++ b/res/values-hr/qcomstrings.xml
@@ -26,7 +26,10 @@
   <!-- Video quality setting entry. Videos will be recorded in QVGA quality. [CHAR LIMIT=24] -->
   <!-- Video quality setting entry. Videos will be recorded in QCIF quality. [CHAR LIMIT=24] -->
   <!-- Settings screen, Power Mode title -->
+  <string name="pref_camera_powermode_title">Način potrošnje</string>
   <!-- Settings screen, Power mode dialog radio button choices -->
+  <string name="pref_camera_powermode_entry_lp">Niska potrošnja</string>
+  <string name="pref_camera_powermode_entry_np">Normalna potrošnja</string>
   <!-- Settings screen, Power mode dialog radio button choices -->
   <!-- Default Power mode.. -->
   <!-- Default auto exposure setting. Do not translate. -->
@@ -51,6 +54,8 @@
   <!-- Settings screen, Select Skin Tone Enhancement title -->
   <string name="pref_camera_skinToneEnhancement_title">Poboljšanje boje kože</string>
   <!-- Settings screen, Skin Tone Enhancement radio button choices -->
+  <string name="pref_camera_skinToneEnhancement_entry_enable">Omogući</string>
+  <string name="pref_camera_skinToneEnhancement_entry_disable">Onemogući</string>
   <!-- Skin Tone Enhancement entry values. Do not translate. -->
   <!-- Settings screen, setting title text for ZSL-->
   <string name="pref_camera_zsl_title">Nula laga okidača</string>
@@ -86,21 +91,35 @@
   <string name="pref_camera_manual_focus_entry_diopter_mode">Način dioptrije</string>
   <string name="pref_camera_manual_focus_entry_off">Isključen</string>
   <!-- Instant Capture entry -->
+  <string name="pref_camera_instant_capture_title">Instantno snimanje</string>
+  <string name="pref_camera_instant_capture_entry_aggressive_aec">Agresivan AEC</string>
+  <string name="pref_camera_instant_capture_entry_fast_aec">Brio AEC</string>
+  <string name="pref_camera_instant_capture_entry_disable">Onemogući</string>
   <!-- Instant Capture entry values -->
   <!-- Settings screen, ZSL location dialog choices -->
   <string name="pref_camera_zsl_entry_off">Isključen</string>
+  <string name="pref_camera_zsl_entry_on">Uklj.</string>
   <!-- The message is shown in toast when HDR or scene mode is enabled -->
+  <string name="hdr_enable_message">HDR je omogućen, podržan je samo način automatske scene</string>
+  <string name="scene_enable_message">HDR nije podržan ni u jednom načinu scena osim u automatskom</string>
   <!-- Settings screen, Video HDR location dialog choices -->
   <string name="pref_camera_video_hdr_entry_off">Isključen</string>
+  <string name="pref_camera_video_hdr_entry_on">Uklj.</string>
   <!-- Settings screen, CDS location dialog choices -->
   <string name="pref_camera_cds_entry_off">Isključen</string>
+  <string name="pref_camera_cds_entry_on">Uklj.</string>
   <string name="pref_camera_cds_entry_auto">Automatski</string>
   <!-- Settings screen, video CDS location dialog choices -->
   <string name="pref_camera_video_cds_entry_off">Isključen</string>
+  <string name="pref_camera_video_cds_entry_on">Uklj.</string>
   <string name="pref_camera_video_cds_entry_auto">Automatski</string>
   <!-- Settings screen, TNR location dialog choices -->
+  <string name="pref_camera_tnr_entry_disable">Onemogući</string>
+  <string name="pref_camera_tnr_entry_enable">Omogući</string>
   <!-- Settings screen, TNR location dialog choices -->
   <!-- Settings screen, video TNR location dialog choices -->
+  <string name="pref_camera_video_tnr_entry_disable">Onemogući</string>
+  <string name="pref_camera_video_tnr_entry_enable">Omogući</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>
@@ -121,15 +140,25 @@
   <string name="pref_camera_facedetection_title">Prepoznavanje lica</string>
   <!-- Settings menu, Face Detection choices -->
   <string name="pref_camera_facedetection_entry_off">Isključen</string>
+  <string name="pref_camera_facedetection_entry_on">Uklj.</string>
   <!-- Default Selfie Flash setting. -->
   <!-- Settings screen, Selfie Flash Detection -->
   <string name="pref_selfie_flash_title">Selfie flash</string>
   <!-- Settings menu, Selfie Flash choices -->
   <string name="pref_selfie_flash_entry_off">Isključen</string>
+  <string name="pref_selfie_flash_entry_on">Uklj.</string>
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <string name="pref_camera_redeyereduction_title">Smanjenje efekta crvenih očiju</string>
   <!-- Settings menu, redeye reduction choices -->
+  <string name="pref_camera_redeyereduction_entry_enable">Omogući</string>
+  <string name="pref_camera_redeyereduction_entry_disable">Onemogući</string>
+  <string name="pref_camera_selfiemirror_title">Selfie ogledalo</string>
+  <string name="pref_camera_selfiemirror_entry_enable">Omogući</string>
+  <string name="pref_camera_selfiemirror_entry_disable">Onemogući</string>
+  <string name="pref_camera_shuttersound_title">Zvuk okidača</string>
+  <string name="pref_camera_shuttersound_entry_enable">Omogućeno</string>
+  <string name="pref_camera_shuttersound_entry_disable">Onemogućeno</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">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 -->
@@ -143,14 +172,20 @@
   <!-- The message is shown in dialog when the app encounters an unsupported video resolution-->
   <string name="error_app_unsupported">Rezolucija nije podržana za ovaj tip kodeka</string>
   <!-- The message is shown in dialog when the app encounters an unsupported video profile-->
+  <string name="error_app_unsupported_profile">Nepodržani profil videa</string>
   <!--The message is shown in dialog when the raw snapshot is selected in zsl mode-->
   <string name="error_app_unsupported_raw">Raw format slike nije podržan u režimu Nula laga okidača. Odaberite JPEG</string>
   <!-- Settings screen, AE bracketing and HDR location dialog choices -->
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">Držanje automatske ekspozicije</string>
   <string name="pref_camera_ae_bracket_hdr_title">Držanje automatske ekspozicije</string>
+  <string name="pref_camera_ae_bracket_hdr_entry_on">Uklj.</string>
+  <string name="err_app_unsupport_ae_bracket_code">AE bracketing još nije podržan</string>
   <!-- The messsage shown if user selects a snapshot resolution lower than the current video size. -->
+  <string name="snapshot_lower_than_video">Rezolucija brzinskog snimka je niža od rezolucije videa. Izaberite rezoluciju veću ili jednaku trenutnoj veličini videa.</string>
   <!-- The messsage shown if user selects a snapshot resolution in low power mode. -->
+  <string name="snapshotsize_low_powermode">Promjena veličine slike nije podržana u načinu niske potrošnje. Snimit će se brzinski snimak. Odaberite način normalne potrošnje kako biste mogli mijenjati veličinu slike.</string>
   <!-- The messsage shown if user tries to take snapshot during D1/QCIF resolution. -->
+  <string name="snapshot_qcif_and_d1">U ovoj su rezoluciji brzinski snimci podržani samo u rezoluciji videa.</string>
   <!-- Default hfr setting. Do not translate. -->
   <!-- Settings screen, Select hfr title -->
   <string name="pref_camera_hfr_title">Usporeni snimak</string>
@@ -163,22 +198,27 @@
   <string name="pref_camera_hfr_entry_hsr_60">Visoka brzina 60 FPS</string>
   <string name="pref_camera_hfr_entry_hsr_90">Visoka brzina 90 FPS</string>
   <string name="pref_camera_hfr_entry_hsr_120">Visoka brzina 120 FPS</string>
+  <string name="pref_camera_hfr_entry_hsr_240">Visoka brzina 120 FPS</string>
   <!-- HFR entry values. Do not translate. -->
   <!-- Default noise reduction setting. Do not translate. -->
   <!-- Settings screen, Select See More title -->
+  <string name="pref_camera_noise_reduction_title">Smanjenje šuma</string>
   <!-- Settings screen, see more radio button choices -->
   <string name="pref_camera_noise_reduction_entry_off">Isključen</string>
   <string name="pref_camera_noise_reduction_entry_fast">Brzo</string>
+  <string name="pref_camera_noise_reduction_entry_high_quality">Visoka kvaliteta</string>
   <!-- see more entry values. Do not translate. -->
   <!-- Default see more setting. Do not translate. -->
   <!-- Settings screen, Select See More title -->
   <!-- Settings screen, see more radio button choices -->
   <string name="pref_camera_see_more_entry_off">Isključen</string>
+  <string name="pref_camera_see_more_entry_on">Uklj.</string>
   <!-- see more entry values. Do not translate. -->
   <!-- Denoise Settings screen, setting title text -->
   <string name="pref_camera_denoise_title">Uklanjanje šuma</string>
   <!-- Denoise Settings screen, Record location dialog choices -->
   <string name="pref_camera_denoise_entry_off">Isključen</string>
+  <string name="pref_camera_denoise_entry_on">Uklj.</string>
   <!-- Default iso setting. Do not translate. -->
   <!-- Settings screen, Select Iso title -->
   <string name="pref_camera_iso_title">ISO</string>
@@ -221,6 +261,7 @@
   <string name="pref_camera_antibanding_entry_1">50 Hz (Europa)</string>
   <string name="pref_camera_antibanding_entry_2">60 Hz (SAD)</string>
   <!-- Default color effect setting. -->
+  <string name="pref_camera_filter_mode_entry_on">Uklj.</string>
   <string name="pref_camera_filter_mode_entry_off">Isključen</string>
   <!-- Settings screen, Select Color effect title -->
   <string name="pref_camera_coloreffect_title">Efekt boje</string>
@@ -246,10 +287,12 @@
   <string name="pref_camera_dis_title">Stabilizacija</string>
   <!-- DIS choices -->
   <string name="pref_camera_dis_entry_off">Isključen</string>
+  <string name="pref_camera_dis_entry_on">Uklj.</string>
   <!-- Select Face Recognition title -->
   <string name="pref_camera_facerc_title">Prepoznavanje lica</string>
   <!-- Face Recognition choices -->
   <string name="pref_camera_facerc_entry_off">Isključen</string>
+  <string name="pref_camera_facerc_entry_on">Uklj.</string>
   <!-- Settings screen, Multiple levels entries -->
   <string name="pref_camera_sharpness_entry_level0">Razina 0</string>
   <string name="pref_camera_sharpness_entry_level1">Razina 1</string>
@@ -301,10 +344,15 @@
   <!-- Settings screen, Picture quality title -->
   <string name="pref_camera_jpegquality_title">Kvaliteta slike</string>
   <!-- Settings screen, Picture quality dialog radio button choices -->
+  <string name="pref_camera_jpegquality_entry_0">Niska</string>
+  <string name="pref_camera_jpegquality_entry_1">Standardna</string>
+  <string name="pref_camera_jpegquality_entry_2">Visoka</string>
   <!-- Default auto histogram setting. Do not translate. -->
   <!-- Settings screen, Select Histogram title -->
   <string name="pref_camera_histogram_title">Histogram</string>
   <!-- Settings screen, Histogram radio button choices -->
+  <string name="pref_camera_histogram_entry_enable">Omogući</string>
+  <string name="pref_camera_histogram_entry_disable">Onemogući</string>
   <!-- Histogram entry values. Do not translate. -->
   <!-- Default auto scene detection setting. -->
   <!-- Settings screen, Select Auto Scene Detection -->
@@ -312,7 +360,9 @@
   <!-- Settings menu, auto scene detection choices -->
   <string name="pref_camera_scenedetect_entry_off">Isključen</string>
   <!-- Scene detection set to on - supports backlight and snow cloudy detection. -->
+  <string name="pref_camera_scenedetect_entry_on">Uklj.</string>
   <!-- Toast showing error if invalid size selected for  time lapse  [CHAR LIMIT=65] -->
+  <string name="time_lapse_error">Neodgovarajuća postavka rezolucije videa za time-lapse snimanje.</string>
   <!-- longshot value -->
   <string name="pref_camera_longshot_title">Kontinuirano snimanje</string>
   <string name="msg_cancel_longshot_for_limited_memory">Ponestaje memorije, isključivanje neprekidnog slikanja</string>
@@ -321,6 +371,8 @@
   <!-- Settings screen, setting title text for Auto HDR-->
   <string name="pref_camera_auto_hdr_title">Auto HDR</string>
   <!-- Settings screen, Auto HDR location dialog choices -->
+  <string name="pref_camera_auto_hdr_entry_enable">Omogući</string>
+  <string name="pref_camera_auto_hdr_entry_disable">Onemogući</string>
   <!-- toast message for storage location switch -->
   <string name="on_switch_save_path_to_sdcard">Prostor interne pohrane nije dovoljan, prebačena lokacija pohrane na SD karticu</string>
   <!-- Settings screen, Selectable HDR mode title -->
@@ -333,6 +385,7 @@
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Rotacija videa</string>
   <!--Menu, video rotation label-->
+  <string name="pref_camera_video_rotation_label">ROTACIJA VIDEA</string>
   <!-- Settings screen, Video rotation dialog radio button choices -->
   <string name="pref_camera_video_rotation_entry_0">0 stupnjeva</string>
   <string name="pref_camera_video_rotation_entry_90">90 stupnjeva</string>
@@ -346,30 +399,100 @@
   <string name="advance_feature_enable_msg">Neprekidno slikanje nije podržano pri uključenim naprednim mogućnostima</string>
   <!-- The alas of CameraActivity for gesture operation -->
   <string name="camera_gesture_title">Pokreni kameru</string>
+  <string name="pref_camera_tsmakeup_title">Uljepšavanje</string>
+  <string name="pref_camera_tsmakeup_entry_on">Uklj.</string>
   <string name="pref_camera_tsmakeup_entry_off">Isključen</string>
+  <string name="pref_camera_tsmakeup_entry_low">Nisko</string>
+  <string name="pref_camera_tsmakeup_entry_mid">Srednje</string>
+  <string name="pref_camera_tsmakeup_entry_high">Visoko</string>
+  <string name="pref_camera_tsmakeup_custom">Prilagođeno</string>
+  <string name="pref_camera_tsmakeup_level_whiten">Izbjeljivanje</string>
+  <string name="pref_camera_tsmakeup_level_clean">Omekšavanje</string>
+  <string name="text_tsmakeup_alert_title">Upozorenje</string>
+  <string name="text_tsmakeup_alert_msg">Da biste se mogli koristiti značajkom uljepšavanja morate omogućiti otkrivanje lica. Želite li nastaviti?</string>
+  <string name="text_tsmakeup_alert_continue">Nastavi</string>
+  <string name="text_tsmakeup_alert_quit">Odustani</string>
+  <string name="text_tsmakeup_beautify_toast">Uljepšaj</string>
   <string name="all_in_focus">Sve u fokusu</string>
   <string name="refocus_toast">Za ponovo fokusiranje zadnje slike, dodirnite ovdje</string>
+  <string name="refocus_prompt_message">Sa UbiFocus-om, fotoaparat će snimiti 5 fotografija, svaki put kad pritisnete okidač. 5 fotografija će biti spojene u 1 fotografiju, sa svime u fokusu. Možete odabrati ponovno fokusiranje, nakon što snimite fotografiju.</string>
+  <string name="camera_thermal_shutdown">Telefon pregrijan, zatvaranje fotoaparata.</string>
+  <string name="camera_server_died">Medijski poslužitelj zatvoren, zatvaranje fotoaparata.</string>
+  <string name="camera_unknown_error">Nepoznata pogreška, zatvaranje fotoaparata.</string>
+  <string name="mute_button_desc">Tipka za isključivanje zvuka</string>
+  <string name="pref_camera2_camera2_title">Camera2 način</string>
   <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_title">Mono samo</string>
+  <string name="pref_camera2_mono_only_entry_on">Uklj.</string>
   <string name="pref_camera2_mono_only_entry_off">Isključen</string>
+  <string name="pref_camera2_mono_preview_title">Mono pregled</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>
   <string name="pref_camera2_clearsight_entry_off">Isključen</string>
   <string name="clearsight_capture_success">ClearSight snimanje upješno</string>
   <string name="clearsight_capture_fail">ClearSight snimanje nije uspjelo</string>
+  <string name="pref_camera2_mpo_title">MPO format</string>
   <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_on">Uklj.</string>
   <string name="pref_camera2_makeup_entry_off">Isključen</string>
+  <string name="pref_camera2_noise_reduction_title">Smanjenje šuma</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_noise_reduction_entry_high_quality">Visoka kvaliteta</string>
+  <string name="pref_camera2_videosnap_title">Auto snapshot veličina</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_title">Praćenje fokusa</string>
+  <string name="pref_camera2_trackingfocus_entry_on">Uklj.</string>
   <string name="pref_camera2_trackingfocus_entry_off">Isključen</string>
+  <string name="pref_camera_scenemode_entry_bestpicture">Najbolja slika</string>
+  <string name="pref_camera_scenemode_entry_sharpshooter">Oštra fotografija</string>
+  <string name="pref_camera_scenemode_entry_trackingfocus">Praćenje fokusa</string>
+  <string name="pref_camera_scenemode_entry_panorama">Panorama</string>
+  <string name="pref_camera_scenemode_entry_promode">Za profiće</string>
+  <string name="bestpicture_done">GOTOVO</string>
+  <string name="bestpicture_at_least_one_picture">Najmanje jedna slika mora biti odabrana.</string>
+  <string name="pref_camera2_shutter_sound_entry_on">Uključeno</string>
   <string name="pref_camera2_shutter_sound_entry_off">Isključen</string>
+  <string name="pref_camera2_shutter_sound_title">Zvuk okidača</string>
   <string name="pref_camera2_timer_entry_off">Isključen</string>
+  <string name="pref_camera2_timer_entry_2sec">2 sekunde</string>
+  <string name="pref_camera2_timer_entry_5sec">5 sekundi</string>
+  <string name="pref_camera2_timer_entry_10sec">10 sekundi</string>
+  <string name="pref_camera2_saveraw_title">Spremanje RAW formatu</string>
+  <string name="panocapture_direction_is_not_determined">Okrećite se u jednom smjeru.</string>
+  <string name="panocapture_intro">Pritisnite tipku fotoaparata za početak.</string>
+  <string name="panocapture_direction_is_changed">Promijenili ste smjer, snimanje panorame zaustavit će se.\u2026</string>
+  <string name="makeup_ui_title">Odaberite snagu uljepšavanja.</string>
+  <string name="makeup_ui_ok_button">U redu</string>
+  <string name="perf_camera2_version_info">Informacije o verziji</string>
+  <string name="perf_camera2_preferences_category_general">Općenito</string>
+  <string name="perf_camera2_preferences_category_photo">Običan fotoaparat</string>
+  <string name="perf_camera2_preferences_category_video">Videokamera</string>
+  <string name="perf_camera2_preferences_category_system">Sustav</string>
+  <string name="pref_camera2_scene_mode_dual_camera_instructional_content">U načinu rada s dvije kamere fotografije će izgledati oštrije. Možete i primijeniti pozadinske efekte tako da uredite slike u Galeriji.</string>
+  <string name="pref_camera2_scene_mode_ubi_focus_instructional_content">S UbiFocusom, fotoaparat će uslikati 5 slika i kombinirati ih u jednu sliku u kojoj je sve lijepo fokusirano. Kad je slika gotova, možete je ponovno fokusirati.</string>
+  <string name="pref_camera2_scene_mode_opti_zoom_instructional_content">Koristite OptiZoom kad trebate zumirati za jasnu sliku. Možete zumirati prije ili poslije slikanja slike.</string>
+  <string name="pref_camera2_scene_mode_sports_instructional_content">Sportski način pomaže vam slikati bolje sportske i akcijske slike.\n\nPoboljšava fotografije, ali nema utjecaja na snimanje videa.</string>
+  <string name="pref_camera2_scene_mode_hdr_instructional_content">Kad ste u miješanim uvjetima osvjetljenja poput lošeg osvjetljenja ili pozadinski osvijetljenih scena odaberite \"HDR\" na najbolje moguće slike.</string>
+  <string name="pref_camera2_scene_mode_best_photo_instructional_content">Omogućava da slikate 10 slika odjednom, a onda kasnije možete odabrati najbolju(e).</string>
+  <string name="pref_camera2_scene_mode_chroma_flash_instructional_content">S ChromaFlashom osvjetljenje na slikama s bljeskalicom bit će optimizirano za sve ljude i objekte na slikama. Ovo se primijenjuje samo za stražnju kameru.</string>
+  <string name="pref_camera2_scene_mode_sharp_photo_instructional_content">Oštra slika smanjuje zamućenje koje se događa zbog kretanja na sceni ili zbog mrdanja ruke.</string>
+  <string name="pref_camera2_scene_mode_tracking_focus_instructional_content">Omogućava da pratite i fokusirate se na odabranu osobu ili objekt dok slikate slike ili snimate videozapise. Za početak stavite pravokutnik na osobu ili objekt koji želite pratiti.</string>
+  <string name="pref_camera2_scene_mode_time_lapse_instructional_content">S Time-lapseom možete dugi video pretvoriti u video od par sekundi. Ovo se primijenjuje na videozapise, ne na fotografije.</string>
+  <string name="pref_camera2_scene_mode_panorama_instructional_content">Omogućava da pomičite uređaj ulijevo ili udesno da slikate široku pejzažnu sliku. Možete pomicati uređaj i prema gore i dolje da slikate dugačke slike.</string>
+  <string name="pref_camera2_scene_mode_blur_buster_instructional_content">BlurBuster smanjuje zamućenje ako vam se tresu ruke. Može biti korisno za slikanje na teškim mjestima.</string>
+  <string name="pref_camera2_scene_mode_pro_instructional_content">U Profesionalnom načinu, možete ručno mijenjati postavke kao što su ISO, ekspozicija, ravnotežu bijele boje i fokus. Imat ćete jednostavan pristup svim ovim naprednim postavkama</string>
+  <string name="pref_camera2_not_show_again">Ne prikazuj ponovno</string>
+  <string name="pref_camera2_scene_mode_instructional_ok">U redu</string>
+  <string name="pref_camera2_instant_aec_title">Instantni AEC</string>
   <string name="pref_camera2_instant_aec_entry_disable">Isključi</string>
+  <string name="pref_camera2_instant_aec_entry_aggressive">Agresivan AEC</string>
+  <string name="pref_camera2_instant_aec_entry_fast">Brio AEC</string>
   <string name="pref_camera2_saturation_level_title">Zasićenje</string>
   <string name="pref_camera2_saturation_level_entry_0">Razina 0</string>
   <string name="pref_camera2_saturation_level_entry_1">Razina 1</string>
@@ -390,23 +513,44 @@
   <string name="pref_camera2_histogram_title">Histogram</string>
   <string name="pref_camera2_histogram_entry_enable">Uključi</string>
   <string name="pref_camera2_histogram_entry_disable">Isključi</string>
+  <string name="pref_camera2_hdr_title">HDR</string>
   <string name="pref_camera2_hdr_entry_enable">Uključi</string>
   <string name="pref_camera2_hdr_entry_disable">Isključi</string>
   <string name="pref_camera2_auto_hdr_title">Auto HDR</string>
   <string name="pref_camera2_auto_hdr_entry_enable">Uključi</string>
   <string name="pref_camera2_auto_hdr_entry_disable">Isključi</string>
+  <string name="pref_camera_bokeh_mode_title">Bokeh način</string>
   <string name="pref_camera_bokeh_mode_entry_enable">Uključi</string>
   <string name="pref_camera_bokeh_mode_entry_disable">Isključi</string>
+  <string name="pref_camera_bokeh_mpo_title">Bokeh način MPO</string>
   <string name="pref_camera_bokeh_mpo_entry_enable">Uključi</string>
   <string name="pref_camera_bokeh_mpo_entry_disable">Isključi</string>
+  <string name="pref_camera_bokeh_blur_degree_title">Vrijednost zamućenja za bokeh</string>
   <!-- Default Zoom setting. -->
+  <string name="pref_camera_zoom_title">Zumiranje</string>
   <!-- Settings menu, Zoom choices -->
   <string name="pref_camera_zoom_entry_off">Isključen</string>
+  <string name="pref_camera_zoom_entry_1x">1x</string>
+  <string name="pref_camera_zoom_entry_2x">2x</string>
+  <string name="pref_camera_zoom_entry_3x">3x</string>
+  <string name="pref_camera_zoom_entry_4x">4x</string>
+  <string name="pref_camera_zoom_entry_5x">5x</string>
+  <string name="pref_camera_zoom_entry_6x">6x</string>
+  <string name="pref_camera_zoom_entry_7x">7x</string>
+  <string name="pref_camera_zoom_entry_8x">8x</string>
+  <string name="pref_camera_zoom_entry_9x">9x</string>
+  <string name="pref_camera_zoom_entry_10x">10x</string>
+  <string name="pref_camera2_bsgc_title">Otkrivanje smiješka/treptanja/pogleda</string>
   <string name="pref_camera2_bsgc_entry_enable">Uključi</string>
   <string name="pref_camera2_bsgc_entry_disable">Isključi</string>
   <string name="pref_camera2_zsl_title">Nula laga okidača</string>
   <string name="pref_camera2_zsl_entry_disable">Isključen</string>
+  <string name="pref_camera2_zsl_entry_app_zsl">Softverski ZSL</string>
+  <string name="pref_camera2_zsl_entry_hal_zsl">Hardverski ZLS</string>
   <!-- QCFA Title -->
   <!-- QCFA choices -->
+  <string name="pref_camera2_switch_camera_title">Promjena kamere ID-om</string>
+  <string name="pref_camera2_initial_camera_entry_bayer">Bayer</string>
   <string name="pref_camera2_initial_camera_entry_mono">Mono</string>
+  <string name="pref_camera2_initial_camera_entry_front">Prednja</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 3d40142e4..890f4cdc2 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -169,6 +169,7 @@
   <!-- In select camera setting, front-facing camera. [CHAR LIMIT=14] -->
   <string name="pref_camera_id_entry_front">Prednji</string>
   <!-- Settings screen, setting title text -->
+  <string name="pref_camera_recordlocation_title">GPS lokacija</string>
   <!--  Label for record location preference [CHAR LIMIT=50] -->
   <string name="pref_camera_location_label">LOKACIJA</string>
   <!-- Title for countdown timer on camera settings screen [CHAR LIMIT=30]-->
@@ -182,6 +183,9 @@
   <!-- Text followed by a checkbox to turn on/off sound effects during the countdown. [CHAR LIMIT = 24]-->
   <string name="pref_camera_timer_sound_title">Zvuk odbrojavanja</string>
   <!-- Entry of camera save path -->
+  <string name="pref_camera_savepath_title">Pohrana</string>
+  <string name="pref_camera_savepath_entry_0">Telefon</string>
+  <string name="pref_camera_savepath_entry_1">SD kartica</string>
   <!-- Entry of a on/off setting. The setting is turned off. [CHAR LIMIT=15] -->
   <string name="setting_off">Isključeno</string>
   <!-- Entry of a on/off setting. The setting is turned on. [CHAR LIMIT=15] -->
@@ -300,14 +304,23 @@
   <!-- Toast after trying to select a setting that is not allowed to change in scene mode [CHAR LIMIT=NONE] -->
   <string name="not_selectable_in_scene_mode">Ne može se odabrati u načinu scene.</string>
   <!-- Toast after enable HDR function to inform Continuous Shot has disabled -->
+  <string name="HDR_disable_continuous_shot">HDR će onemogućiti neprekidno fotografiranje.</string>
   <!-- Toast after enable Advanced Capture function to inform Continuous Shot has disabled -->
+  <string name="advanced_capture_disable_continuous_shot">Napredno slikanje onemogućit će neprekidno fotografiranje.</string>
   <!-- Toast after enable 2k4k video quality to inform IS has disabled -->
+  <string name="video_quality_4k_disable_IS">4K kvaliteta videa onemogućit će stabilizaciju slike.</string>
   <!-- Toast after 2k4k video is enabled to inform SeeMore has been disabled -->
+  <string name="video_quality_4k_disable_SeeMore">SeeMore ne može se omogućiti tijekom 4K videa.</string>
   <!-- Toast after High Quality Noise Reduction has been enabled to show CDS is disabled -->
+  <string name="disable_CDS_during_HighQualityNoiseReduction">Visokokvalitetno smanjenje šuma onemogućit će CDS.</string>
   <!-- Toast after High Quality Noise Reduction has been enabled to show TNR is disabled -->
+  <string name="disable_TNR_during_HighQualityNoiseReduction">Visokokvalitetno smanjenje šuma onemogućit će TNR.</string>
   <!-- Toast after SeeMore has been enabled to show CDS is disabled -->
+  <string name="disable_CDS_during_SeeMore">SeeMore će onemogućiti CDS.</string>
   <!-- Toast after SeeMore has been enabled to show TNR is disabled -->
+  <string name="disable_TNR_during_SeeMore">SeeMore će onemogućiti TNR.</string>
   <!-- Toast after SeeMore has been enabled to show NR is disabled -->
+  <string name="disable_NR_during_SeeMore">SeeMore će onemogućiti smanjenje šuma.</string>
   <!-- Exposure settings in preference -->
   <string name="pref_exposure_title">Ekspozicija</string>
   <!--  menu label exposure compensation [CHAR LIMIT=50] -->
@@ -385,6 +398,7 @@
   <!-- The shutter button. [CHAR LIMIT = NONE] -->
   <string name="accessibility_shutter_button">Okidač</string>
   <!-- The exit best photo mode button. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_exit_best_mode_button">Izlaz iz načina najbolje fotografije</string>
   <!-- The menu button. [CHAR LIMIT = NONE] -->
   <string name="accessibility_menu_button">Gumb izbornika</string>
   <!-- The mode picker to switch between camera, video and panorama. [CHAR LIMIT = NONE] -->
@@ -540,6 +554,34 @@ CHAR LIMIT = NONE] -->
   <!--  String shown when setting the homepage wallpaper in the background [CHAR LIMIT=NONE] -->
   <string name="setting_wallpaper">Postavljanje pozadinske slike</string>
   <!-- Menu, Video rotation labels [CHAR LIMIT=50] -->
+  <string name="remaining_photos_format">%d preostalo</string>
+  <string name="makeup_video_size_limit">Makeup radi samo pod VGA veličinom u snimanju videa.</string>
+  <string name="pref_camera2_category_system">Sustav</string>
+  <string name="pref_camera2_restore_default">Vrati zadano</string>
+  <string name="pref_camera2_restore_default_hint">Postavke fotoaparata vratit će se na zadane postavke</string>
+  <plurals name="save_best_dialog_content">
+    <item quantity="one">%1$d od 10 slika će se spremiti, a ostale izbrisati.</item>
+    <item quantity="few">%1$d od 10 slika će se spremiti, a ostale izbrisati.</item>
+    <item quantity="other">%1$d od 10 slika će se spremiti, a ostale izbrisati.</item>
+  </plurals>
+  <string name="save_best_dialog_title">Spremiti odabrane slike?</string>
   <string name="save_best_dialog_positive_bt">U redu</string>
+  <string name="save_best_dialog_native_bt">Odustani</string>
+  <plurals name="save_best_image_toast">
+    <item quantity="one">%1$d od 10 slika je spremljena.</item>
+    <item quantity="few">%1$d od 10 slika su spremljene.</item>
+    <item quantity="other">%1$d od 10 slika je spremljeno.</item>
+  </plurals>
+  <string name="dialog_do_not_show">Ne prikazuj ponovno</string>
+  <string name="delete_best_dialog_title">Izbrisati sve?</string>
+  <string name="delete_best_dialog_content">Jeste li sigurni da želite obrisati svih 10 slika?</string>
+  <string name="delete_best_dialog_native_bt">Odustani</string>
   <string name="delete_best_dialog_positive_bt">Obriši</string>
+  <string name="delete_all_best_dialog_title">Izbrisati sve?</string>
+  <string name="delete_all_best_dialog_content">Da li ste sigurni da želite izbrisati sve slike?</string>
+  <string name="delete_all_best_dialog_native_bt">Odustani</string>
+  <string name="delete_all_best_dialog_positive_bt">Izbriši sve</string>
+  <string name="overflow_best_item1">Spremi sve</string>
+  <string name="overflow_best_item2">Izbriši sve</string>
+  <string name="settings_title">Postavke</string>
 </resources>
diff --git a/res/values-it/qcomstrings.xml b/res/values-it/qcomstrings.xml
index 33eadc5f3..d6011422d 100644
--- a/res/values-it/qcomstrings.xml
+++ b/res/values-it/qcomstrings.xml
@@ -450,15 +450,46 @@
   <string name="pref_camera2_trackingfocus_entry_on">On</string>
   <string name="pref_camera2_trackingfocus_entry_off">Off</string>
   <string name="pref_camera_scenemode_entry_bestpicture">Immagine migliore</string>
+  <string name="pref_camera_scenemode_entry_sharpshooter">Foto nitida</string>
   <string name="pref_camera_scenemode_entry_trackingfocus">Traccia il fuoco</string>
+  <string name="pref_camera_scenemode_entry_panorama">Panorama</string>
+  <string name="pref_camera_scenemode_entry_promode">Modalità Pro</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_timer_entry_off">Off</string>
+  <string name="pref_camera2_timer_entry_2sec">2 secondi</string>
+  <string name="pref_camera2_timer_entry_5sec">5 secondi</string>
+  <string name="pref_camera2_timer_entry_10sec">10 secondi</string>
+  <string name="pref_camera2_saveraw_title">Salva in formato Raw</string>
+  <string name="panocapture_direction_is_not_determined">Muoviti costantemente verso una direzione.</string>
+  <string name="panocapture_intro">Premi il tasto fotocamera per iniziare.</string>
+  <string name="panocapture_direction_is_changed">La direzione è cambiata, l\'acquisizione della panoramica è stata conclusa\u2026</string>
+  <string name="makeup_ui_title">Seleziona il livello d\'abbellimento.</string>
   <string name="makeup_ui_ok_button">OK</string>
+  <string name="perf_camera2_version_info">Informazioni versione</string>
+  <string name="perf_camera2_preferences_category_general">Generali</string>
+  <string name="perf_camera2_preferences_category_photo">Fotocamera ferma</string>
+  <string name="perf_camera2_preferences_category_video">Videocamera</string>
+  <string name="perf_camera2_preferences_category_system">Sistema</string>
+  <string name="pref_camera2_scene_mode_dual_camera_instructional_content">In modalità dual camera, le tue foto saranno più pulite. Puoi anche applicare degli effetti di sfondo, modificando le foto nella galleria.</string>
+  <string name="pref_camera2_scene_mode_ubi_focus_instructional_content">Con UbiFocus, la tua fotocamera scatta cinque foto e le combina in un\'unica immagine, dove tutto è a fuoco. È possibile scegliere di mettere nuovamente a fuoco, dopo aver scattato la foto.</string>
+  <string name="pref_camera2_scene_mode_opti_zoom_instructional_content">Utilizza OptiZoom quando desideri ingrandire per un\'immagine più nitida. È possibile eseguire lo zoom prima o dopo aver scattato la foto.</string>
+  <string name="pref_camera2_scene_mode_sports_instructional_content">La modalità Sport ti aiuta a scattare foto migliori nelle azioni in movimento.\n\nMigliora le tue foto, ma non ha alcun effetto sulla registrazione video.</string>
+  <string name="pref_camera2_scene_mode_hdr_instructional_content">Quando sei in condizioni di luce mista come scarsa luminosità o in controluce, seleziona \"HDR\" per ottenere le migliori immagini possibili.</string>
+  <string name="pref_camera2_scene_mode_best_photo_instructional_content">Ti consente di scattare 10 foto in rapida successione, quindi puoi scegliere le migliori.</string>
+  <string name="pref_camera2_scene_mode_chroma_flash_instructional_content">Con ChromaFlash, l\'illuminazione delle tue foto con flash sarà ottimizzata per tutte le persone e gli oggetti presenti nella scena. Questa funzione si applica solo alla fotocamera posteriore.</string>
+  <string name="pref_camera2_scene_mode_sharp_photo_instructional_content">Foto nitida riduce la sfocatura dovuta al movimento nella scena o della tua mano.</string>
+  <string name="pref_camera2_scene_mode_tracking_focus_instructional_content">Ti permette di seguire e mantenere il fuoco su una persona o un oggetto mentre scatti foto o registri video. Per iniziare posiziona il rettangolo della messa a fuoco sulla persona o sull\'oggetto che vuoi seguire.</string>
+  <string name="pref_camera2_scene_mode_time_lapse_instructional_content">Con Time lapse, puoi trasformare una lunga registrazione video in un video di pochi secondi. Questo effetto si applica ai video, ma non alle foto.</string>
+  <string name="pref_camera2_scene_mode_panorama_instructional_content">Consente di ruotare a sinistra o a destra per scattare una foto panoramica. È possibile ruotare su o giù per scattare foto verticali.</string>
+  <string name="pref_camera2_scene_mode_blur_buster_instructional_content">BlurBuster riduce la sfocatura dovuta al tremolio delle mani. Può essere utile quando si scattano foto in condizioni difficili.</string>
+  <string name="pref_camera2_scene_mode_pro_instructional_content">Con la modalità Pro, puoi controllare manualmente le impostazioni per ISO, esposizione, bilanciamento del bianco e messa a fuoco. Avrai facile accesso a tutte queste impostazioni avanzate</string>
+  <string name="pref_camera2_not_show_again">Non mostrare di nuovo</string>
   <string name="pref_camera2_scene_mode_instructional_ok">OK</string>
+  <string name="pref_camera2_instant_aec_title">AEC istantanea</string>
   <string name="pref_camera2_instant_aec_entry_disable">Disattiva</string>
   <string name="pref_camera2_instant_aec_entry_aggressive">AEC aggressivo</string>
   <string name="pref_camera2_instant_aec_entry_fast">AEC rapido</string>
@@ -482,24 +513,43 @@
   <string name="pref_camera2_histogram_title">Istogramma</string>
   <string name="pref_camera2_histogram_entry_enable">Attiva</string>
   <string name="pref_camera2_histogram_entry_disable">Disattiva</string>
+  <string name="pref_camera2_hdr_title">HDR</string>
   <string name="pref_camera2_hdr_entry_enable">Attiva</string>
   <string name="pref_camera2_hdr_entry_disable">Disattiva</string>
   <string name="pref_camera2_auto_hdr_title">Auto HDR</string>
   <string name="pref_camera2_auto_hdr_entry_enable">Attiva</string>
   <string name="pref_camera2_auto_hdr_entry_disable">Disattiva</string>
+  <string name="pref_camera_bokeh_mode_title">Modalità bokeh</string>
   <string name="pref_camera_bokeh_mode_entry_enable">Attiva</string>
   <string name="pref_camera_bokeh_mode_entry_disable">Disattiva</string>
+  <string name="pref_camera_bokeh_mpo_title">Modalità bokeh MPO</string>
   <string name="pref_camera_bokeh_mpo_entry_enable">Attiva</string>
   <string name="pref_camera_bokeh_mpo_entry_disable">Disattiva</string>
+  <string name="pref_camera_bokeh_blur_degree_title">Valore di sfocatura bokeh</string>
   <!-- Default Zoom setting. -->
+  <string name="pref_camera_zoom_title">Zoom</string>
   <!-- Settings menu, Zoom choices -->
   <string name="pref_camera_zoom_entry_off">Off</string>
+  <string name="pref_camera_zoom_entry_1x">1x</string>
+  <string name="pref_camera_zoom_entry_2x">2x</string>
+  <string name="pref_camera_zoom_entry_3x">3x</string>
+  <string name="pref_camera_zoom_entry_4x">4x</string>
+  <string name="pref_camera_zoom_entry_5x">5x</string>
+  <string name="pref_camera_zoom_entry_6x">6x</string>
+  <string name="pref_camera_zoom_entry_7x">7x</string>
+  <string name="pref_camera_zoom_entry_8x">8x</string>
+  <string name="pref_camera_zoom_entry_9x">9x</string>
+  <string name="pref_camera_zoom_entry_10x">10x</string>
+  <string name="pref_camera2_bsgc_title">Riconoscimento sorriso/sguardo/occhi chiusi</string>
   <string name="pref_camera2_bsgc_entry_enable">Attiva</string>
   <string name="pref_camera2_bsgc_entry_disable">Disattiva</string>
   <string name="pref_camera2_zsl_title">Ritardo zero dell\'otturatore</string>
   <string name="pref_camera2_zsl_entry_disable">Off</string>
+  <string name="pref_camera2_zsl_entry_app_zsl">ZSL software</string>
+  <string name="pref_camera2_zsl_entry_hal_zsl">ZSL hardware</string>
   <!-- QCFA Title -->
   <!-- QCFA choices -->
+  <string name="pref_camera2_switch_camera_title">Cambia fotocamera per ID</string>
   <string name="pref_camera2_initial_camera_entry_bayer">Bayer</string>
   <string name="pref_camera2_initial_camera_entry_mono">Mono</string>
   <string name="pref_camera2_initial_camera_entry_front">Davanti</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 03298815a..480a3d675 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -393,6 +393,7 @@
   <!-- The shutter button. [CHAR LIMIT = NONE] -->
   <string name="accessibility_shutter_button">Otturatore</string>
   <!-- The exit best photo mode button. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_exit_best_mode_button">Esci dalla modalità foto migliori</string>
   <!-- The menu button. [CHAR LIMIT = NONE] -->
   <string name="accessibility_menu_button">Pulsante Menu</string>
   <!-- The mode picker to switch between camera, video and panorama. [CHAR LIMIT = NONE] -->
@@ -554,6 +555,30 @@ CHAR LIMIT = NONE] -->
   <string name="remaining_photos_format">Ancora %d</string>
   <string name="initial_recording_seconds">00:00</string>
   <string name="makeup_video_size_limit">Abbellimento funziona solo con la risoluzione VGA per le registrazioni video.</string>
+  <string name="pref_camera2_category_system">Sistema</string>
+  <string name="pref_camera2_restore_default">Ripristina predefinite</string>
+  <string name="pref_camera2_restore_default_hint">Le impostazioni della fotocamera verranno ripristinate alle impostazioni predefinite</string>
+  <plurals name="save_best_dialog_content">
+    <item quantity="one">%1$d delle 10 immagini verranno salvate, il resto eliminate</item>
+    <item quantity="other">%1$d delle 10 immagini verranno salvate, il resto eliminate</item>
+  </plurals>
+  <string name="save_best_dialog_title">Salvare le immagini selezionate?</string>
   <string name="save_best_dialog_positive_bt">OK</string>
+  <string name="save_best_dialog_native_bt">Annulla</string>
+  <plurals name="save_best_image_toast">
+    <item quantity="one">%1$d di 10 immagini salvate.</item>
+    <item quantity="other">%1$d di 10 immagini salvate.</item>
+  </plurals>
+  <string name="dialog_do_not_show">Non mostrare più</string>
+  <string name="delete_best_dialog_title">Eliminare tutto?</string>
+  <string name="delete_best_dialog_content">Sei sicuro di voler eliminare tutte le 10 foto scattate?</string>
+  <string name="delete_best_dialog_native_bt">Annulla</string>
   <string name="delete_best_dialog_positive_bt">Elimina</string>
+  <string name="delete_all_best_dialog_title">Eliminare tutto?</string>
+  <string name="delete_all_best_dialog_content">Sei sicuro di voler eliminare tutte le immagini?</string>
+  <string name="delete_all_best_dialog_native_bt">Annulla</string>
+  <string name="delete_all_best_dialog_positive_bt">Elimina tutto</string>
+  <string name="overflow_best_item1">Salva tutto</string>
+  <string name="overflow_best_item2">Elimina tutto</string>
+  <string name="settings_title">Impostazioni</string>
 </resources>
diff --git a/res/values-iw/qcomstrings.xml b/res/values-iw/qcomstrings.xml
index 318c8954d..ce5721ce0 100644
--- a/res/values-iw/qcomstrings.xml
+++ b/res/values-iw/qcomstrings.xml
@@ -484,6 +484,7 @@
   <string name="pref_camera2_scene_mode_sharp_photo_instructional_content">חידוד תמונה מפחית את הטשטוש מתנועת ידיים או תנועה בצילום.</string>
   <string name="pref_camera2_scene_mode_tracking_focus_instructional_content">מאפשר מעקב פוקוס אחר אדם או חפץ תוך כדי צילום תמונות או סרטונים. להפעלה, התמקד על האדם או החפץ למעקב.</string>
   <string name="pref_camera2_scene_mode_time_lapse_instructional_content">עם כיווץ זמן, אפשר לכווץ סרטון ארוך לכמה שניות. האפקט חל על סרטונים בלבד כמובן.</string>
+  <string name="pref_camera2_scene_mode_panorama_instructional_content">מאפשר להזיז ימינה או שמאלה לצילום תמונה ארוכה יותר. אפשר גם להזיז למעלה או למטה.</string>
   <string name="pref_camera2_scene_mode_blur_buster_instructional_content">BlurBuster מפחית את הטשטוש הנגרם מידיים רועדות. זה יכול להיות שימושי כשמצלמים תמונות במקומות קשים.</string>
   <string name="pref_camera2_scene_mode_pro_instructional_content">עם מצב מתקדם, תוכל להתאים אישית את זמן החשיפה, ISO, איזון לבן והמיקוד. תהיה לך גישה קלה לכל ההגדרות המתקדמות הללו</string>
   <string name="pref_camera2_not_show_again">אל תציג שוב</string>
@@ -548,6 +549,7 @@
   <string name="pref_camera2_zsl_entry_hal_zsl">ZSL (צילום ללא שהייה) חומרתי</string>
   <!-- QCFA Title -->
   <!-- QCFA choices -->
+  <string name="pref_camera2_switch_camera_title">החלף למצלמה על ידי מזהה</string>
   <string name="pref_camera2_initial_camera_entry_bayer">באייר</string>
   <string name="pref_camera2_initial_camera_entry_mono">מונוכרום</string>
   <string name="pref_camera2_initial_camera_entry_front">קדמית</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index e850a3843..7fc6f156b 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -564,9 +564,21 @@ CHAR LIMIT = NONE] -->
   <string name="pref_camera2_category_system">מערכת</string>
   <string name="pref_camera2_restore_default">שחזר ברירות מחדל</string>
   <string name="pref_camera2_restore_default_hint">הגדרות המצלמה ישוחזרו לברירת המחדל</string>
+  <plurals name="save_best_dialog_content">
+    <item quantity="one">תמונה אחת מתוך 10 התמונות תשמר והשאר ימחקו</item>
+    <item quantity="two">%1$d מתוך 10 התמונות ישמרו והשאר ימחקו</item>
+    <item quantity="many">%1$d מתוך 10 התמונות ישמרו והשאר ימחקו</item>
+    <item quantity="other">%1$d מתוך 10 התמונות ישמרו והשאר ימחקו</item>
+  </plurals>
   <string name="save_best_dialog_title">לשמור את התמונות שנבחרו?</string>
   <string name="save_best_dialog_positive_bt">אישור</string>
   <string name="save_best_dialog_native_bt">בטל</string>
+  <plurals name="save_best_image_toast">
+    <item quantity="one">תמונה אחת נשמרה.</item>
+    <item quantity="two">%1$d מתוך 10 תמונות נשמרו.</item>
+    <item quantity="many">%1$d מתוך 10 תמונות נשמרו.</item>
+    <item quantity="other">%1$d מתוך 10 תמונות נשמרו.</item>
+  </plurals>
   <string name="dialog_do_not_show">אל תציג שוב</string>
   <string name="delete_best_dialog_title">למחוק הכול?</string>
   <string name="delete_best_dialog_content">למחוק את כל העשרה תמונות שצולמו?</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 8a92bde9a..d559d6ef4 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -551,9 +551,15 @@ CHAR LIMIT = NONE] -->
   <string name="pref_camera2_category_system">시스템</string>
   <string name="pref_camera2_restore_default">기본 설정 복원</string>
   <string name="pref_camera2_restore_default_hint">카메라 설정이 기본 설정으로 복원됩니다.</string>
+  <plurals name="save_best_dialog_content">
+    <item quantity="other">10개 중 %1$d개 이미지만 저장됩니다. 나머지 이미지는 삭제됩니다.</item>
+  </plurals>
   <string name="save_best_dialog_title">선택한 이미지를 저장하시겠습니까?</string>
   <string name="save_best_dialog_positive_bt">확인</string>
   <string name="save_best_dialog_native_bt">취소</string>
+  <plurals name="save_best_image_toast">
+    <item quantity="other">10개 중 %1$d개 이미지가 저장되었습니다.</item>
+  </plurals>
   <string name="dialog_do_not_show">다시 보지 않기</string>
   <string name="delete_best_dialog_title">모두 삭제하시겠습니까?</string>
   <string name="delete_best_dialog_content">촬영한 10개의 사진을 정말 모두 삭제하시겠습니까?</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 5d8ee7f60..ee2d8a03b 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -29,11 +29,6 @@
   <!-- Details dialog "OK" button. Dismisses dialog. -->
   <string name="delete">Usuń</string>
   <!-- String Delete the selected media item(s) [CHAR LIMIT=50] -->
-  <plurals name="delete_selection">
-    <item quantity="one">Usunąć wybrany element?</item>
-    <item quantity="few">Usunąć wybrane elementy?</item>
-    <item quantity="other">Usunąć wybranych elementów?</item>
-  </plurals>
   <string name="share">Udostępnij</string>
   <string name="share_panorama">Udostępnij panoramę</string>
   <string name="share_as_photo">Udostępnij jako zdjęcie</string>
@@ -45,25 +40,10 @@
   <string name="close">Zamknij</string>
   <!-- String indicating how many media item(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
-  <plurals name="number_of_items_selected">
-    <item quantity="one">%1$d wybrany</item>
-    <item quantity="few">%1$d wybrane</item>
-    <item quantity="other">%1$d wybranych</item>
-  </plurals>
   <!-- String indicating how many media album(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
-  <plurals name="number_of_albums_selected">
-    <item quantity="one">%1$d wybrany</item>
-    <item quantity="few">%1$d wybrane</item>
-    <item quantity="other">%1$d wybranych</item>
-  </plurals>
   <!-- String indicating how many media group(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
-  <plurals name="number_of_groups_selected">
-    <item quantity="one">%1$d wybrana</item>
-    <item quantity="few">%1$d wybrane</item>
-    <item quantity="other">%1$d wybranych</item>
-  </plurals>
   <!-- String indicating timestamp of photo or video -->
   <string name="show_on_map">Pokaż na mapie</string>
   <string name="rotate_left">Obróć w lewo</string>
@@ -175,11 +155,6 @@
   <!-- Title for countdown timer on camera settings screen [CHAR LIMIT=30]-->
   <string name="pref_camera_timer_title">Samowyzwalacz</string>
   <!-- Entry for countdown timer setting. e.g. 1 second, 10 seconds, etc. [CHAR LIMIT=30]-->
-  <plurals name="pref_camera_timer_entry">
-    <item quantity="one">1 sekunda</item>
-    <item quantity="few">%d sekundy</item>
-    <item quantity="other">%d sekund</item>
-  </plurals>
   <!-- Text followed by a checkbox to turn on/off sound effects during the countdown. [CHAR LIMIT = 24]-->
   <string name="pref_camera_timer_sound_title">Sygnał odliczania</string>
   <!-- Entry of camera save path -->
diff --git a/res/values-pt-rPT/qcomstrings.xml b/res/values-pt-rPT/qcomstrings.xml
index 15e787ed5..1026b0a5e 100644
--- a/res/values-pt-rPT/qcomstrings.xml
+++ b/res/values-pt-rPT/qcomstrings.xml
@@ -484,6 +484,7 @@
   <string name="pref_camera2_scene_mode_sharp_photo_instructional_content">A foto nítida reduz a desfocagem derivada do movimento da cena ou do movimento da mão.</string>
   <string name="pref_camera2_scene_mode_tracking_focus_instructional_content">Permite que foque e siga uma pessoa ou objeto selecionados enquanto fotografa ou grava vídeos. Para iniciar, posicione o retângulo de focagem na pessoa ou objeto que quer seguir.</string>
   <string name="pref_camera2_scene_mode_time_lapse_instructional_content">Com o intervalo de tempo, pode converter uma gravação de vídeo longa em poucos segundos de vídeo. Este efeito aplica-se a vídeos mas não a fotos.</string>
+  <string name="pref_camera2_scene_mode_panorama_instructional_content">Permite que vire para a esquerda ou direita para tirar uma fotografia panorâmica. Também pode virar para cima ou para baixo para tirar fotos em altura.</string>
   <string name="pref_camera2_scene_mode_blur_buster_instructional_content">O BlurBuster reduz a desfocagem derivada do movimento das mãos. Pode ser útil quando tirar fotografias em sítios difíceis.</string>
   <string name="pref_camera2_scene_mode_pro_instructional_content">Com o Modo Pro, pode controlar manualmente parâmetros como o ISO, a exposição, o equilíbrio dos brancos e a focagem. Terá acesso simplificado a todas estas funcionalidades avançadas</string>
   <string name="pref_camera2_not_show_again">Não mostrar novamente</string>
@@ -548,6 +549,7 @@
   <string name="pref_camera2_zsl_entry_hal_zsl">ZSL por hardware</string>
   <!-- QCFA Title -->
   <!-- QCFA choices -->
+  <string name="pref_camera2_switch_camera_title">Alterar câmara pelo ID</string>
   <string name="pref_camera2_initial_camera_entry_bayer">Bayer</string>
   <string name="pref_camera2_initial_camera_entry_mono">Monocromático</string>
   <string name="pref_camera2_initial_camera_entry_front">Frontal</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 3408f60d6..83c4142c5 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -27,17 +27,17 @@
              that is to be "set as" (e.g. set as contact photo or set as wallpaper) -->
   <string name="set_image">Definir imagem como:</string>
   <!-- Details dialog "OK" button. Dismisses dialog. -->
-  <string name="delete">Eliminar</string>
+  <string name="delete">Apagar</string>
   <!-- String Delete the selected media item(s) [CHAR LIMIT=50] -->
   <plurals name="delete_selection">
-    <item quantity="one">Eliminar o item selecionado?</item>
-    <item quantity="other">Eliminar os itens selecionados?</item>
+    <item quantity="one">Apagar o item selecionado?</item>
+    <item quantity="other">Apagar os itens selecionados?</item>
   </plurals>
   <string name="share">Partilhar</string>
   <string name="share_panorama">Partilhar panorama</string>
   <string name="share_as_photo">Partilhar como fotografia</string>
   <!-- The label shown after an image is deleted [CHAR LIMIT=16] -->
-  <string name="deleted">Eliminada</string>
+  <string name="deleted">Apagada</string>
   <!-- The label on the button which when clicked will undo a deletion of image [CHAR LIMIT=16]-->
   <string name="undo">ANULAR</string>
   <string name="details">Detalhes</string>
@@ -331,7 +331,7 @@
   <!-- Dialog "OK" button. Dismisses dialog. -->
   <string name="dialog_ok">OK</string>
   <!-- Low-memory dialog message [CHAR LIMIT=NONE] -->
-  <string name="spaceIsLow_content" product="default">Está a ficar sem espaço no cartão SD. Altere as definições de qualidade ou elimine algumas imagens ou outros ficheiros.</string>
+  <string name="spaceIsLow_content" product="default">Está a ficar sem espaço no cartão SD. Altere as definições de qualidade ou apague algumas imagens ou outros ficheiros.</string>
   <!-- Camera format string for new image files. Passed to java.text.SimpleDateFormat. -->
   <!-- Video Camera format string for new video files. Passed to java.text.SimpleDateFormat. -->
   <!-- Filename prefix for panorama output. -->
@@ -554,16 +554,24 @@ CHAR LIMIT = NONE] -->
   <string name="pref_camera2_category_system">Sistema</string>
   <string name="pref_camera2_restore_default">Repor predefinições</string>
   <string name="pref_camera2_restore_default_hint">As definições da câmara serão restauradas para as definições predefinidas</string>
+  <plurals name="save_best_dialog_content">
+    <item quantity="one">%1$d de 10 imagens será guardada e as restantes serão apagadas</item>
+    <item quantity="other">%1$d de 10 imagens serão guardadas e as restantes serão apagadas</item>
+  </plurals>
   <string name="save_best_dialog_title">Guardar as imagens selecionadas?</string>
   <string name="save_best_dialog_positive_bt">OK</string>
   <string name="save_best_dialog_native_bt">Cancelar</string>
+  <plurals name="save_best_image_toast">
+    <item quantity="one">%1$d de 10 imagens guardada.</item>
+    <item quantity="other">%1$d de 10 imagens guardadas.</item>
+  </plurals>
   <string name="dialog_do_not_show">Não mostrar novamente</string>
   <string name="delete_best_dialog_title">Apagar todas?</string>
   <string name="delete_best_dialog_content">Tem a certeza de que quer apagar todas as 10 fotos tiradas?</string>
   <string name="delete_best_dialog_native_bt">Cancelar</string>
-  <string name="delete_best_dialog_positive_bt">Eliminar</string>
+  <string name="delete_best_dialog_positive_bt">Apagar</string>
   <string name="delete_all_best_dialog_title">Apagar todas?</string>
-  <string name="delete_all_best_dialog_content">Tem a certeza de que pretende eliminar todas as imagens?</string>
+  <string name="delete_all_best_dialog_content">Tem a certeza de que pretende apagar todas as imagens?</string>
   <string name="delete_all_best_dialog_native_bt">Cancelar</string>
   <string name="delete_all_best_dialog_positive_bt">Apagar todas</string>
   <string name="overflow_best_item1">Guardar todas</string>
diff --git a/res/values-ro/qcomstrings.xml b/res/values-ro/qcomstrings.xml
index 6e8bda1c0..ec60c8122 100644
--- a/res/values-ro/qcomstrings.xml
+++ b/res/values-ro/qcomstrings.xml
@@ -484,6 +484,7 @@
   <string name="pref_camera2_scene_mode_sharp_photo_instructional_content">Fotografia detaliată reduce ceața cauzată de mișcarea din scenă ori cea a mâinii.</string>
   <string name="pref_camera2_scene_mode_tracking_focus_instructional_content">Vă permite să urmăriți şi să focalizați o persoană sau un obiect selectat în timp ce realizați fotografii sau clipuri video. Pentru a începe, poziţionați dreptunghiul de focalizare pe o persoană sau pe obiectul pe care doriţi să le urmăriţi.</string>
   <string name="pref_camera2_scene_mode_time_lapse_instructional_content">Cu Time lapse, puteţi transforma o înregistrare video lungă într-un video de doar câteva secunde. Acest efect se aplică videoclipurilor, dar nu și fotografiilor.</string>
+  <string name="pref_camera2_scene_mode_panorama_instructional_content">Vă permite să panoramați în stânga sau în dreapta pentru a face o fotografie peisaj largă. Aveţi posibilitatea să panoramați în sus sau în jos pentru a face fotografii înalte.</string>
   <string name="pref_camera2_scene_mode_blur_buster_instructional_content">BlurBuster reduce ceața cauzată de mișcarea mâinilor. Poate fi util când realizați fotografii în locuri dificile.</string>
   <string name="pref_camera2_scene_mode_pro_instructional_content">Cu modul Pro, puteţi controla manual setările pentru ISO, expunere, balans de alb şi focalizarea. Veţi avea acces uşor la toate aceste setări avansate</string>
   <string name="pref_camera2_not_show_again">Nu mai afişa</string>
@@ -548,6 +549,7 @@
   <string name="pref_camera2_zsl_entry_hal_zsl">ZSL hardware</string>
   <!-- QCFA Title -->
   <!-- QCFA choices -->
+  <string name="pref_camera2_switch_camera_title">Comutatare cameră prin ID</string>
   <string name="pref_camera2_initial_camera_entry_bayer">Bayer</string>
   <string name="pref_camera2_initial_camera_entry_mono">Mono</string>
   <string name="pref_camera2_initial_camera_entry_front">Frontal</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index c1546a8fb..c1b55e777 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -565,9 +565,19 @@ CHAR LIMIT = NONE] -->
   <string name="pref_camera2_category_system">Sistem</string>
   <string name="pref_camera2_restore_default">Restabiliți la valorile implicite</string>
   <string name="pref_camera2_restore_default_hint">Setările camerei vor fi restaurate la valorile implicite</string>
+  <plurals name="save_best_dialog_content">
+    <item quantity="one">%1$d din 10 imagini va fi salvată și restul vor fi șterse</item>
+    <item quantity="few">%1$d din 10 imagini vor fi salvate și restul vor fi șterse</item>
+    <item quantity="other">%1$d din 10 imagini vor fi salvate și restul vor fi șterse</item>
+  </plurals>
   <string name="save_best_dialog_title">Salvați imaginile selectate?</string>
   <string name="save_best_dialog_positive_bt">OK</string>
   <string name="save_best_dialog_native_bt">Anulați</string>
+  <plurals name="save_best_image_toast">
+    <item quantity="one">%1$d din 10 imagini salvată.</item>
+    <item quantity="few">%1$d din 10 imagini salvate.</item>
+    <item quantity="other">%1$d din 10 imagini salvate.</item>
+  </plurals>
   <string name="dialog_do_not_show">Nu mai afişa</string>
   <string name="delete_best_dialog_title">Ștergeți tot?</string>
   <string name="delete_best_dialog_content">Sigur doriți să ștergeți toate cele 10 fotografii?</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index d92a9d2a4..6ffac690b 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -29,11 +29,6 @@
   <!-- Details dialog "OK" button. Dismisses dialog. -->
   <string name="delete">Удалить</string>
   <!-- String Delete the selected media item(s) [CHAR LIMIT=50] -->
-  <plurals name="delete_selection">
-    <item quantity="one">Удалить выбранный файл?</item>
-    <item quantity="few">Удалить выбранные файлы?</item>
-    <item quantity="other">Удалить выбранные файлы?</item>
-  </plurals>
   <string name="share">Отправить</string>
   <string name="share_panorama">Отправить панораму</string>
   <string name="share_as_photo">Отправить фото</string>
@@ -45,25 +40,10 @@
   <string name="close">Закрыть</string>
   <!-- String indicating how many media item(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
-  <plurals name="number_of_items_selected">
-    <item quantity="one">Выбрано: %1$d</item>
-    <item quantity="few">Выбрано: %1$d</item>
-    <item quantity="other">Выбрано: %1$d</item>
-  </plurals>
   <!-- String indicating how many media album(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
-  <plurals name="number_of_albums_selected">
-    <item quantity="one">Выбрано: %1$d</item>
-    <item quantity="few">Выбрано: %1$d</item>
-    <item quantity="other">Выбрано: %1$d</item>
-  </plurals>
   <!-- String indicating how many media group(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
-  <plurals name="number_of_groups_selected">
-    <item quantity="one">Выбрано: %1$d</item>
-    <item quantity="few">Выбрано: %1$d</item>
-    <item quantity="other">Выбрано: %1$d</item>
-  </plurals>
   <!-- String indicating timestamp of photo or video -->
   <string name="show_on_map">Показать на карте</string>
   <string name="rotate_left">Повернуть влево</string>
@@ -177,11 +157,6 @@
   <!-- Title for countdown timer on camera settings screen [CHAR LIMIT=30]-->
   <string name="pref_camera_timer_title">Автоспуск</string>
   <!-- Entry for countdown timer setting. e.g. 1 second, 10 seconds, etc. [CHAR LIMIT=30]-->
-  <plurals name="pref_camera_timer_entry">
-    <item quantity="one">1 секунда</item>
-    <item quantity="few">%d секунды</item>
-    <item quantity="other">%d секунд</item>
-  </plurals>
   <!-- Text followed by a checkbox to turn on/off sound effects during the countdown. [CHAR LIMIT = 24]-->
   <string name="pref_camera_timer_sound_title">Сигнал</string>
   <!-- Entry of camera save path -->
diff --git a/res/values-sk/qcomstrings.xml b/res/values-sk/qcomstrings.xml
index e89320083..d1e9e78f2 100644
--- a/res/values-sk/qcomstrings.xml
+++ b/res/values-sk/qcomstrings.xml
@@ -484,6 +484,7 @@
   <string name="pref_camera2_scene_mode_sharp_photo_instructional_content">Sharp Photo znižuje rozmazanie, ktoré je spôsobené pohybom v scéne alebo pohybom rúk.</string>
   <string name="pref_camera2_scene_mode_tracking_focus_instructional_content">Umožňuje sledovať a zaostriť vybranú osobu alebo objekt pri fotografovaní alebo videu. Ak chcete začať, umiestnite ohniskový obdĺžnik na osobu alebo objekt, ktorý chcete zachytiť.</string>
   <string name="pref_camera2_scene_mode_time_lapse_instructional_content">S časozberným nahrávaním môžete premeniť dlhé video na niekoľko-sekundové. Tento efekt platí pre videá, nie pre fotografie.</string>
+  <string name="pref_camera2_scene_mode_panorama_instructional_content">Umožňuje posunúť doľava alebo doprava, aby ste získali širokú krajinnú fotografiu. Môžete tiež posunúť nahor alebo nadol pre zachytenie vysokých snímok.</string>
   <string name="pref_camera2_scene_mode_blur_buster_instructional_content">BlurBuster znižuje rozmazanie z trasúcich sa rúk. Môže byť užitočné pri fotografovaní v ťažkých podmienkach.</string>
   <string name="pref_camera2_scene_mode_pro_instructional_content">V režime Pro môžete ručne ovládať nastavenia pre ISO, expozíciu, vyváženie bielej a zaostrenie. Budete mať ľahký prístup ku všetkým týmto pokročilým nastaveniam</string>
   <string name="pref_camera2_not_show_again">Nabudúce nezobrazovať</string>
@@ -548,6 +549,7 @@
   <string name="pref_camera2_zsl_entry_hal_zsl">Harvérové ZSL</string>
   <!-- QCFA Title -->
   <!-- QCFA choices -->
+  <string name="pref_camera2_switch_camera_title">Prepínanie fotoaparátu pomocou ID</string>
   <string name="pref_camera2_initial_camera_entry_bayer">Bayer</string>
   <string name="pref_camera2_initial_camera_entry_mono">Čiernobiely</string>
   <string name="pref_camera2_initial_camera_entry_front">Predná</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 1fb5f895f..86adff209 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -29,11 +29,6 @@
   <!-- Details dialog "OK" button. Dismisses dialog. -->
   <string name="delete">Odstrániť</string>
   <!-- String Delete the selected media item(s) [CHAR LIMIT=50] -->
-  <plurals name="delete_selection">
-    <item quantity="one">Odstrániť vybratú položku?</item>
-    <item quantity="few">Odstrániť vybraté položky?</item>
-    <item quantity="other">Odstrániť vybrané položky?</item>
-  </plurals>
   <string name="share">Zdieľať</string>
   <string name="share_panorama">Zdieľať panorámu</string>
   <string name="share_as_photo">Zdieľať ako fotografiu</string>
@@ -45,25 +40,10 @@
   <string name="close">Zavrieť</string>
   <!-- String indicating how many media item(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
-  <plurals name="number_of_items_selected">
-    <item quantity="one">%1$d vybraná</item>
-    <item quantity="few">%1$d vybrané</item>
-    <item quantity="other">%1$d vybraných</item>
-  </plurals>
   <!-- String indicating how many media album(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
-  <plurals name="number_of_albums_selected">
-    <item quantity="one">Počet vybratých položiek: %1$d</item>
-    <item quantity="few">Počet vybratých položiek: %1$d</item>
-    <item quantity="other">%1$d vybraných</item>
-  </plurals>
   <!-- String indicating how many media group(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
-  <plurals name="number_of_groups_selected">
-    <item quantity="one">Počet vybratých položiek: %1$d</item>
-    <item quantity="few">Počet vybratých položiek: %1$d</item>
-    <item quantity="other">%1$d vybraných</item>
-  </plurals>
   <!-- String indicating timestamp of photo or video -->
   <string name="show_on_map">Zobraziť na mape</string>
   <string name="rotate_left">Otočiť doľava</string>
@@ -175,11 +155,6 @@
   <!-- Title for countdown timer on camera settings screen [CHAR LIMIT=30]-->
   <string name="pref_camera_timer_title">Časovač odpočítavania</string>
   <!-- Entry for countdown timer setting. e.g. 1 second, 10 seconds, etc. [CHAR LIMIT=30]-->
-  <plurals name="pref_camera_timer_entry">
-    <item quantity="one">1 sekunda</item>
-    <item quantity="few">%d sekundy</item>
-    <item quantity="other">%d sekúnd</item>
-  </plurals>
   <!-- Text followed by a checkbox to turn on/off sound effects during the countdown. [CHAR LIMIT = 24]-->
   <string name="pref_camera_timer_sound_title">Zvuk odpočítavania</string>
   <!-- Entry of camera save path -->
diff --git a/res/values-sl/qcomstrings.xml b/res/values-sl/qcomstrings.xml
index 7416ee08d..63edf1955 100644
--- a/res/values-sl/qcomstrings.xml
+++ b/res/values-sl/qcomstrings.xml
@@ -484,6 +484,7 @@
   <string name="pref_camera2_scene_mode_sharp_photo_instructional_content">Ostra fotografija zmanjša zamegljenost, ki je posledica gibanja v prizoru ali gibanja rok.</string>
   <string name="pref_camera2_scene_mode_tracking_focus_instructional_content">Dovoli sledenje in izostritev izbrane osebe ali predmeta medtem ko snemate fotografije ali videoposnetke. Za začetek postavite izostritveni pravokotnik na osebo ali predmet, ki mu želite slediti.</string>
   <string name="pref_camera2_scene_mode_time_lapse_instructional_content">S časovnim zamikom lahko dolg videoposnetek preoblikujete v nekaj sekund videa. Velja za videoposnetke, vendar nima učinka na fotografijah.</string>
+  <string name="pref_camera2_scene_mode_panorama_instructional_content">Dovoli premik levo ali desno za zajem široke fotografije pokrajine. Premaknete lahko tudi gor ali dol za zajem visokih fotografij.</string>
   <string name="pref_camera2_scene_mode_blur_buster_instructional_content">BlurBuster zmanjša zamegljenost zaradi tresočih rok. Lahko je v pomoč med fotografiranjem v težavnih mestih.</string>
   <string name="pref_camera2_scene_mode_pro_instructional_content">Z načinom Pro lahko nadzorujete nastavitve za ISO, osvetlitev, ravnovesje beline in ostrenja. Imeli boste enostaven dostop do vseh teh naprednih nastavitev</string>
   <string name="pref_camera2_not_show_again">Ne prikaži ponovno</string>
@@ -548,6 +549,7 @@
   <string name="pref_camera2_zsl_entry_hal_zsl">Strojni ZSL</string>
   <!-- QCFA Title -->
   <!-- QCFA choices -->
+  <string name="pref_camera2_switch_camera_title">Preklop fotoaparata z ID-jem</string>
   <string name="pref_camera2_initial_camera_entry_bayer">Bayer</string>
   <string name="pref_camera2_initial_camera_entry_mono">Mono</string>
   <string name="pref_camera2_initial_camera_entry_front">Sprednja</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 8e003defa..9f68ae283 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -566,9 +566,21 @@ CHAR LIMIT = NONE] -->
   <string name="pref_camera2_category_system">Sistem</string>
   <string name="pref_camera2_restore_default">Obnovi privzete</string>
   <string name="pref_camera2_restore_default_hint">Nastavitve fotoaparata bodo obnovljene na privzete nastavitve</string>
+  <plurals name="save_best_dialog_content">
+    <item quantity="one">%1$d od 10 fotografij bo shranjena, ostale bodo izbrisane</item>
+    <item quantity="two">%1$d od 10 fotografij bosta shranjeni, ostale bodo izbrisane</item>
+    <item quantity="few">%1$d od 10 fotografij bodo shranjene, ostale bodo izbrisane</item>
+    <item quantity="other">%1$d od 10 fotografij bo shranjenih, ostale bodo izbrisane</item>
+  </plurals>
   <string name="save_best_dialog_title">Shrani izbrane slike?</string>
   <string name="save_best_dialog_positive_bt">V redu</string>
   <string name="save_best_dialog_native_bt">Prekliči</string>
+  <plurals name="save_best_image_toast">
+    <item quantity="one">%1$d od 10 fotografij shranjena.</item>
+    <item quantity="two">%1$d od 10 fotografij shranjeni.</item>
+    <item quantity="few">%1$d od 10 fotografij shranjene.</item>
+    <item quantity="other">%1$d od 10 fotografij shranjenih.</item>
+  </plurals>
   <string name="dialog_do_not_show">Ne prikaži ponovno</string>
   <string name="delete_best_dialog_title">Izbriši vse?</string>
   <string name="delete_best_dialog_content">Ali ste prepričani, da želite izbrisati vseh 10 posnetih fotografij?</string>
diff --git a/res/values-tr/qcomstrings.xml b/res/values-tr/qcomstrings.xml
index 297c59908..21ec3251c 100644
--- a/res/values-tr/qcomstrings.xml
+++ b/res/values-tr/qcomstrings.xml
@@ -484,6 +484,7 @@
   <string name="pref_camera2_scene_mode_sharp_photo_instructional_content">Keskin fotoğraf modu sahnedeki hareketten kaynaklanan bulanıklığı veya el hareketi nedeniyle olan bulanıklığı azaltır.</string>
   <string name="pref_camera2_scene_mode_tracking_focus_instructional_content">Fotoğraf veya video çekerken seçilen bir kişiyi veya nesneyi izlemenize ve odaklamanıza izin verir. Başlamak için odaK dikdörtgeni, izlemek istediğiniz kişi veya nesne üzerine konumlandırın.</string>
   <string name="pref_camera2_scene_mode_time_lapse_instructional_content">Zaman atlama ile uzun bir video kaydını birkaç saniyelik videolara dönüştürebilirsiniz. Bu efekt videolara uygulanır, ancak fotoğraflarda geçerli değildir.</string>
+  <string name="pref_camera2_scene_mode_panorama_instructional_content">Geniş yatay fotoğraf çekmek için sola veya sağa kaydırmanızı sağlar. Ayrıca, uzun fotoğraf çekmek için yukarı veya aşağı hareket ettirebilirsiniz.</string>
   <string name="pref_camera2_scene_mode_blur_buster_instructional_content">BlurBuster titreyen eller yüzünden oluşan bulanıklığı düşürür. Bu zor yerlerde fotoğraf çekerken yardımcı olabilir.</string>
   <string name="pref_camera2_scene_mode_pro_instructional_content">Pro modunda, ISO, pozlama, beyaz dengesi ve odak ayarlarını el ile kontrol edebilirsiniz. Bu gelişmiş ayarların tümüne kolaylıkla erişebilirsiniz</string>
   <string name="pref_camera2_not_show_again">Tekrar gösterme</string>
@@ -548,6 +549,7 @@
   <string name="pref_camera2_zsl_entry_hal_zsl">Donanımsal ZSL</string>
   <!-- QCFA Title -->
   <!-- QCFA choices -->
+  <string name="pref_camera2_switch_camera_title">Kamerayı kullanıcıya göre değiştir</string>
   <string name="pref_camera2_initial_camera_entry_bayer">Bayer</string>
   <string name="pref_camera2_initial_camera_entry_mono">Mono</string>
   <string name="pref_camera2_initial_camera_entry_front">Ön</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 32c3a3ecb..1a8c82a3e 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -559,9 +559,17 @@ CHAR LIMIT = NONE] -->
   <string name="pref_camera2_category_system">Sistem</string>
   <string name="pref_camera2_restore_default">Varsayılanı geri yükle</string>
   <string name="pref_camera2_restore_default_hint">Kamera ayarları varsayılan ayarlara geri yüklenecek</string>
+  <plurals name="save_best_dialog_content">
+    <item quantity="one">10 resimden %1$d tanesi kaydedilecek ve geri kalan kısım silinecek</item>
+    <item quantity="other">10 resimden %1$d tanesi kaydedilecek ve geri kalan kısım silinecek</item>
+  </plurals>
   <string name="save_best_dialog_title">Seçilmiş resimler kaydedilsin mi?</string>
   <string name="save_best_dialog_positive_bt">Tamam</string>
   <string name="save_best_dialog_native_bt">İptal</string>
+  <plurals name="save_best_image_toast">
+    <item quantity="one">10 resimden %1$d tanesi kaydedildi.</item>
+    <item quantity="other">10 resimden %1$d tanesi kaydedildi.</item>
+  </plurals>
   <string name="dialog_do_not_show">Tekrar gösterme</string>
   <string name="delete_best_dialog_title">Tümü silinsin mi?</string>
   <string name="delete_best_dialog_content">Çekilen 10 resmin tümünü silmek istediğinizden emin misiniz?</string>
diff --git a/res/values-ug/strings.xml b/res/values-ug/strings.xml
index f1a5f5353..bb1e34f1b 100644
--- a/res/values-ug/strings.xml
+++ b/res/values-ug/strings.xml
@@ -29,9 +29,6 @@
   <!-- Details dialog "OK" button. Dismisses dialog. -->
   <string name="delete">ئۆچۈر</string>
   <!-- String Delete the selected media item(s) [CHAR LIMIT=50] -->
-  <plurals name="delete_selection">
-    <item quantity="other">تاللىغان تۈرنى ئۆچۈرەمدۇ؟</item>
-  </plurals>
   <string name="share">ھەمبەھىر</string>
   <string name="share_panorama">پۈتۈن مەنزىرە ھەمبەھىر</string>
   <string name="share_as_photo">سۈرەت سۈپىتىدە ھەمبەھىر</string>
@@ -43,19 +40,10 @@
   <string name="close">تاقاش</string>
   <!-- String indicating how many media item(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
-  <plurals name="number_of_items_selected">
-    <item quantity="other">%1$d تاللاندى</item>
-  </plurals>
   <!-- String indicating how many media album(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
-  <plurals name="number_of_albums_selected">
-    <item quantity="other">%1$d تاللاندى</item>
-  </plurals>
   <!-- String indicating how many media group(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
-  <plurals name="number_of_groups_selected">
-    <item quantity="other">%1$d تاللاندى</item>
-  </plurals>
   <!-- String indicating timestamp of photo or video -->
   <string name="show_on_map">خەرىتىدە كۆرسەت</string>
   <string name="rotate_left">سولغا ئايلاندۇرۇش</string>
@@ -164,9 +152,6 @@
   <!-- Title for countdown timer on camera settings screen [CHAR LIMIT=30]-->
   <string name="pref_camera_timer_title">تەتۈر سانىغۇچ ۋاقىت خاتىرىلىگۈچ</string>
   <!-- Entry for countdown timer setting. e.g. 1 second, 10 seconds, etc. [CHAR LIMIT=30]-->
-  <plurals name="pref_camera_timer_entry">
-    <item quantity="other">1 سېكۇنت</item>
-  </plurals>
   <!-- Text followed by a checkbox to turn on/off sound effects during the countdown. [CHAR LIMIT = 24]-->
   <string name="pref_camera_timer_sound_title">تەتۈر ساناۋاتقاندا ئەسكەرتىش ئاۋازى چىقار</string>
   <!-- Entry of camera save path -->
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 0770f8a27..0294fdb4d 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -29,11 +29,6 @@
   <!-- Details dialog "OK" button. Dismisses dialog. -->
   <string name="delete">Видалити</string>
   <!-- String Delete the selected media item(s) [CHAR LIMIT=50] -->
-  <plurals name="delete_selection">
-    <item quantity="one">Видалити вибраний елемент?</item>
-    <item quantity="few">Видалити вибрані елементи?</item>
-    <item quantity="other">Видалити вибрані елементи?</item>
-  </plurals>
   <string name="share">Поділитися</string>
   <string name="share_panorama">Поділитися панорамою</string>
   <string name="share_as_photo">Поділитися як фотографією</string>
@@ -45,25 +40,10 @@
   <string name="close">Закрити</string>
   <!-- String indicating how many media item(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
-  <plurals name="number_of_items_selected">
-    <item quantity="one">Вибрано %1$d</item>
-    <item quantity="few">Вибрано %1$d</item>
-    <item quantity="other">Вибрано %1$d</item>
-  </plurals>
   <!-- String indicating how many media album(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
-  <plurals name="number_of_albums_selected">
-    <item quantity="one">Вибрано %1$d</item>
-    <item quantity="few">Вибрано %1$d</item>
-    <item quantity="other">Вибрано %1$d</item>
-  </plurals>
   <!-- String indicating how many media group(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
-  <plurals name="number_of_groups_selected">
-    <item quantity="one">Вибрано %1$d</item>
-    <item quantity="few">Вибрано %1$d</item>
-    <item quantity="other">Вибрано %1$d</item>
-  </plurals>
   <!-- String indicating timestamp of photo or video -->
   <string name="show_on_map">Показати на карті</string>
   <string name="rotate_left">Повернути ліворуч</string>
@@ -177,11 +157,6 @@
   <!-- Title for countdown timer on camera settings screen [CHAR LIMIT=30]-->
   <string name="pref_camera_timer_title">Таймер зворотного відліку</string>
   <!-- Entry for countdown timer setting. e.g. 1 second, 10 seconds, etc. [CHAR LIMIT=30]-->
-  <plurals name="pref_camera_timer_entry">
-    <item quantity="one">1 секунда</item>
-    <item quantity="few">%d секунди</item>
-    <item quantity="other">%d секунд</item>
-  </plurals>
   <!-- Text followed by a checkbox to turn on/off sound effects during the countdown. [CHAR LIMIT = 24]-->
   <string name="pref_camera_timer_sound_title">Звуковий сигнал під час зворотного відліку</string>
   <!-- Entry of camera save path -->
diff --git a/res/values-vi/qcomstrings.xml b/res/values-vi/qcomstrings.xml
index 5654b6d38..1c1516870 100644
--- a/res/values-vi/qcomstrings.xml
+++ b/res/values-vi/qcomstrings.xml
@@ -484,6 +484,7 @@
   <string name="pref_camera2_scene_mode_sharp_photo_instructional_content">Ảnh sắc nét làm giảm mờ do chuyển động trong hiện trường hoặc do chuyển động bằng tay.</string>
   <string name="pref_camera2_scene_mode_tracking_focus_instructional_content">Cho phép bạn theo dõi và tập trung lựa chọn cá nhân hoặc đối tượng trong khi chụp ảnh hoặc video. Để bắt đầu, vị trí hình chữ nhật tập trung vào một người hoặc đối tượng bạn muốn theo dõi.</string>
   <string name="pref_camera2_scene_mode_time_lapse_instructional_content">Với Time lapse, bạn có thể chuyển đổi một ghi âm dài video vào một vài giây của video. Này có hiệu lực áp dụng cho video, nhưng không có hình ảnh.</string>
+  <string name="pref_camera2_scene_mode_panorama_instructional_content">Cho phép bạn xoay trái hoặc phải để chụp ảnh phong cảnh rộng. Bạn cũng có thể xoay lên hoặc xuống để chụp ảnh cao.</string>
   <string name="pref_camera2_scene_mode_blur_buster_instructional_content">BlurBuster giảm mờ từ bàn tay run rẩy. Nó có thể hữu ích khi chụp ảnh ở những nơi khó khăn.</string>
   <string name="pref_camera2_scene_mode_pro_instructional_content">Với Chế độ chuyên nghiệp, bạn có thể tự kiểm soát cài đặt cho ISO, phơi ảnh, cân bằng trắng, và lấy nét. Bạn sẽ dễ dàng truy cập vào tất cả các cài đặt nâng cao này</string>
   <string name="pref_camera2_not_show_again">Không hiện lại</string>
@@ -548,6 +549,7 @@
   <string name="pref_camera2_zsl_entry_hal_zsl">Phần cứng ZSL</string>
   <!-- QCFA Title -->
   <!-- QCFA choices -->
+  <string name="pref_camera2_switch_camera_title">Chuyển máy ảnh bằng ID</string>
   <string name="pref_camera2_initial_camera_entry_bayer">Bayer</string>
   <string name="pref_camera2_initial_camera_entry_mono">Đơn sắc</string>
   <string name="pref_camera2_initial_camera_entry_front">Trước</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index c2cc5ed0c..affc39010 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -550,9 +550,15 @@ CHAR LIMIT = NONE] -->
   <string name="pref_camera2_category_system">Hệ thống</string>
   <string name="pref_camera2_restore_default">Khôi phục mặc định</string>
   <string name="pref_camera2_restore_default_hint">Cài đặt máy ảnh sẽ được khôi phục về cài đặt mặc định</string>
+  <plurals name="save_best_dialog_content">
+    <item quantity="other">%1$d trong 10 hình ảnh sẽ được lưu và phần còn lại sẽ bị xóa</item>
+  </plurals>
   <string name="save_best_dialog_title">Lưu hình ảnh được chọn?</string>
   <string name="save_best_dialog_positive_bt">OK</string>
   <string name="save_best_dialog_native_bt">Hủy</string>
+  <plurals name="save_best_image_toast">
+    <item quantity="other">%1$d trong số 10 hình ảnh đã lưu.</item>
+  </plurals>
   <string name="dialog_do_not_show">Không hiện lại</string>
   <string name="delete_best_dialog_title">Xoá tất cả?</string>
   <string name="delete_best_dialog_content">Bạn có chắc chắn muốn xóa tất cả 10 ảnh đã chụp?</string>
diff --git a/res/values-zh-rCN/qcomstrings.xml b/res/values-zh-rCN/qcomstrings.xml
index 161468bd9..36c5d472c 100644
--- a/res/values-zh-rCN/qcomstrings.xml
+++ b/res/values-zh-rCN/qcomstrings.xml
@@ -484,6 +484,7 @@
   <string name="pref_camera2_scene_mode_sharp_photo_instructional_content">锐化照片将会减少由于运动或者挥手引起的模糊。</string>
   <string name="pref_camera2_scene_mode_tracking_focus_instructional_content">允许您跟踪并保持聚焦在您所选择的人或物件上以拍摄照片或视频。在要跟踪的人或物件上聚焦即可开始。</string>
   <string name="pref_camera2_scene_mode_time_lapse_instructional_content">在延时摄影模式下，您可以将一段长时间的视频转换为只有几秒钟的视频。此效果仅限视频，对于照片无效。</string>
+  <string name="pref_camera2_scene_mode_panorama_instructional_content">允许您从左到右拍摄一幅风景照片。您也可以从上到下拍摄一幅长条形的照片。</string>
   <string name="pref_camera2_scene_mode_blur_buster_instructional_content">模糊抵消器将会抵消由于拍摄时手部抖动造成的模糊，这会协助您在困难环境的拍摄。</string>
   <string name="pref_camera2_scene_mode_pro_instructional_content">在专业模式下，您可以手动控制ISO，曝光，白平衡和对焦。 您将可以轻松访问这些高级设置</string>
   <string name="pref_camera2_not_show_again">不再显示</string>
@@ -548,6 +549,7 @@
   <string name="pref_camera2_zsl_entry_hal_zsl">硬件零延迟快门</string>
   <!-- QCFA Title -->
   <!-- QCFA choices -->
+  <string name="pref_camera2_switch_camera_title">通过 ID 切换相机</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>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 56e477771..8e50be3b7 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -554,9 +554,15 @@ CHAR LIMIT = NONE] -->
   <string name="pref_camera2_category_system">系统</string>
   <string name="pref_camera2_restore_default">恢复默认值</string>
   <string name="pref_camera2_restore_default_hint">相机设置将恢复为默认值</string>
+  <plurals name="save_best_dialog_content">
+    <item quantity="other">10 张图像中的 %1$d 张将被保存，其余的会被删除</item>
+  </plurals>
   <string name="save_best_dialog_title">是否保存已选择的图像？</string>
   <string name="save_best_dialog_positive_bt">确定</string>
   <string name="save_best_dialog_native_bt">返回</string>
+  <plurals name="save_best_image_toast">
+    <item quantity="other">已保存 10 张图像中的 %1$d 张。</item>
+  </plurals>
   <string name="dialog_do_not_show">不再显示</string>
   <string name="delete_best_dialog_title">删除所有？</string>
   <string name="delete_best_dialog_content">是否确定要删除所拍的所有10张照片？</string>
diff --git a/res/values-zh-rTW/qcomstrings.xml b/res/values-zh-rTW/qcomstrings.xml
index e3997ce62..baa8c322a 100644
--- a/res/values-zh-rTW/qcomstrings.xml
+++ b/res/values-zh-rTW/qcomstrings.xml
@@ -484,6 +484,7 @@
   <string name="pref_camera2_scene_mode_sharp_photo_instructional_content">使用銳化照片可減少由於場景中的運動或由於手動造成的模糊。</string>
   <string name="pref_camera2_scene_mode_tracking_focus_instructional_content">允許您在拍攝照片或錄影時追蹤和對焦選定的人物或物體。 要開始，將焦點矩形放置在要追蹤的人物或物體上。</string>
   <string name="pref_camera2_scene_mode_time_lapse_instructional_content">使用縮時，您可以將長時間的影片錄製轉換為幾秒鐘的影片。此效果適用於影片，但不適用於照片。</string>
+  <string name="pref_camera2_scene_mode_panorama_instructional_content">允許您向左或向右平移拍攝寬闊的風景照片。 您也可以向上或向下平移拍攝高的照片。</string>
   <string name="pref_camera2_scene_mode_blur_buster_instructional_content">使用模糊剋星可減輕抖動的模糊。在困難的地方拍照時可能會有所幫助。</string>
   <string name="pref_camera2_scene_mode_pro_instructional_content">使用專業模式，您可以手動控制 ISO、曝光、白平衡和對焦的設定。 您可以輕鬆存取所有這些進階設定</string>
   <string name="pref_camera2_not_show_again">不再顯示</string>
@@ -548,6 +549,7 @@
   <string name="pref_camera2_zsl_entry_hal_zsl">硬體 ZSL</string>
   <!-- QCFA Title -->
   <!-- QCFA choices -->
+  <string name="pref_camera2_switch_camera_title">透過 ID 切換相機</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>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 8faaeae0c..e21bffdc8 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -553,9 +553,15 @@ CHAR LIMIT = NONE] -->
   <string name="pref_camera2_category_system">系統</string>
   <string name="pref_camera2_restore_default">還原預設值</string>
   <string name="pref_camera2_restore_default_hint">相機設定會還原為預設設定</string>
+  <plurals name="save_best_dialog_content">
+    <item quantity="other">將儲存 10 張中的 %1$d 張照片，其餘的將被刪除。</item>
+  </plurals>
   <string name="save_best_dialog_title">儲存已選擇的照片？</string>
   <string name="save_best_dialog_positive_bt">確定</string>
   <string name="save_best_dialog_native_bt">取消</string>
+  <plurals name="save_best_image_toast">
+    <item quantity="other">已儲存 10 張照片中的 %1$d 張。</item>
+  </plurals>
   <string name="dialog_do_not_show">不再顯示</string>
   <string name="delete_best_dialog_title">刪除全部?</string>
   <string name="delete_best_dialog_content">確定刪除全部 10 張照片嗎？</string>