From 2e4c28533573558821788913d4032f39c1638337 Mon Sep 17 00:00:00 2001
From: Abhisek Devkota <ciwrl@lineageos.org>
Date: Fri, 28 Apr 2017 14:28:15 -0700
Subject: Automatic translation import

Change-Id: I10022ef978136b916ef41e72da1b664709dc0c74
---
 res/values-af/cm_strings.xml       |   2 +
 res/values-ast-rES/cm_strings.xml  |  58 +--------
 res/values-ast-rES/qcomstrings.xml |  80 +-----------
 res/values-ast-rES/strings.xml     | 179 ++------------------------
 res/values-bn-rBD/cm_strings.xml   |   1 +
 res/values-ca/cm_strings.xml       |   2 +-
 res/values-el/cm_strings.xml       |   1 +
 res/values-en-rAU/cm_strings.xml   |  75 +++++++++++
 res/values-en-rAU/qcomstrings.xml  | 180 ++++++++++++++++++++++++++
 res/values-en-rAU/strings.xml      | 257 +++++++++++++++++++++++++++++++++++++
 res/values-en-rGB/cm_strings.xml   |  75 +++++++++++
 res/values-en-rGB/qcomstrings.xml  | 180 ++++++++++++++++++++++++++
 res/values-en-rGB/strings.xml      | 257 +++++++++++++++++++++++++++++++++++++
 res/values-en-rIN/cm_strings.xml   |  75 +++++++++++
 res/values-en-rIN/qcomstrings.xml  | 180 ++++++++++++++++++++++++++
 res/values-en-rIN/strings.xml      | 257 +++++++++++++++++++++++++++++++++++++
 res/values-es-rUS/cm_strings.xml   |   8 +-
 res/values-es-rUS/qcomstrings.xml  |  14 +-
 res/values-es-rUS/strings.xml      |  14 +-
 res/values-eu-rES/cm_strings.xml   |   1 +
 res/values-fr/cm_strings.xml       |   1 +
 res/values-fr/qcomstrings.xml      |   2 +
 res/values-hu/cm_strings.xml       |   1 +
 res/values-in/qcomstrings.xml      |   2 +-
 res/values-in/strings.xml          |   4 +-
 res/values-ko/cm_strings.xml       |   4 +
 res/values-ko/qcomstrings.xml      |   2 +
 res/values-ko/strings.xml          |   2 +
 res/values-nl/qcomstrings.xml      |   8 +-
 res/values-nl/strings.xml          |   6 +-
 res/values-pt-rBR/cm_strings.xml   |   1 +
 res/values-sl/qcomstrings.xml      |  10 +-
 res/values-sq-rAL/cm_strings.xml   |  22 ++++
 res/values-sq-rAL/qcomstrings.xml  |  62 +++++++++
 res/values-sq-rAL/strings.xml      | 144 +++++++++++++++++++++
 res/values-sv/cm_strings.xml       |   1 +
 res/values-uk/cm_strings.xml       |   2 +-
 res/values-uk/strings.xml          |   2 +-
 38 files changed, 1834 insertions(+), 338 deletions(-)

diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index e8059a119..c50e968ac 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -18,10 +18,12 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- common aspect ratios -->
   <!-- aspect ratio greater than 16:9, so "widescreen" or "cinematic" -->
+  <string name="pref_camera_aspectratio_wide">Breed</string>
   <!-- Format for entries in the picture size menu. Parameter one is aspect ratio,
          parameter two is size in megapixels, e.g. "(4:3) 12.1 megapixels"
          NOTE: for Chinese (zh) and Korean (ko) the pixel number (parameter two)
          will be multiplied by 100 as those languages want to count by ten thousands -->
+  <string name="pref_camera_megapixel_format">(<xliff:g id="ratio" example="16:9">%1$s</xliff:g>) <xliff:g id="pixels">%2$1.1f</xliff:g> megapieksels</string>
   <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">Macro+</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Verminder vervaag beweging</string>
diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml
index ebb48302e..dd93ba798 100644
--- a/res/values-ast-rES/cm_strings.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -18,10 +18,12 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- common aspect ratios -->
   <!-- aspect ratio greater than 16:9, so "widescreen" or "cinematic" -->
+  <string name="pref_camera_aspectratio_wide">Anchor</string>
   <!-- Format for entries in the picture size menu. Parameter one is aspect ratio,
          parameter two is size in megapixels, e.g. "(4:3) 12.1 megapixels"
          NOTE: for Chinese (zh) and Korean (ko) the pixel number (parameter two)
          will be multiplied by 100 as those languages want to count by ten thousands -->
+  <string name="pref_camera_megapixel_format">(<xliff:g id="ratio" example="16:9">%1$s</xliff:g>) <xliff:g id="pixels">%2$1.1f</xliff:g> megapíxeles</string>
   <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">Macro+</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Reductor de desenfoque</string>
@@ -34,72 +36,18 @@
   <string name="pref_camera_scenemode_entry_backlightportrait">Retratu a contralluz</string>
   <string name="pref_camera_scenemode_entry_barcode">Códigu de barres</string>
   <string name="pref_camera_scenemode_entry_beach">Sablera</string>
-  <string name="pref_camera_scenemode_entry_beauty">Belleza</string>
   <string name="pref_camera_scenemode_entry_candlelight">Lluz de vela</string>
-  <string name="pref_camera_scenemode_entry_cine">Cine</string>
-  <string name="pref_camera_scenemode_entry_closeup">Detalle</string>
-  <string name="pref_camera_scenemode_entry_dark">Escuru</string>
-  <string name="pref_camera_scenemode_entry_dish">Reflector</string>
-  <string name="pref_camera_scenemode_entry_duskdawn">Riscar/Aséu</string>
   <string name="pref_camera_scenemode_entry_document">Documentu</string>
-  <string name="pref_camera_scenemode_entry_fallcolor">Color cayíu</string>
-  <string name="pref_camera_scenemode_entry_fireworks">Fuegos artificiales</string>
-  <string name="pref_camera_scenemode_entry_flowers">Flores</string>
-  <string name="pref_camera_scenemode_entry_handheldtwilight">Atapecer</string>
+  <string name="pref_camera_scenemode_entry_fireworks">Voladores</string>
   <string name="pref_camera_scenemode_entry_highsensitivity">Sensibilidá alta</string>
-  <string name="pref_camera_scenemode_entry_indoor">Interior</string>
-  <string name="pref_camera_scenemode_entry_landscape">Paisaxe</string>
-  <string name="pref_camera_scenemode_entry_mix_illuminant">Lluces amestaes</string>
-  <string name="pref_camera_scenemode_entry_mood">Humor</string>
-  <string name="pref_camera_scenemode_entry_nightportrait">Retratu nocherniegu</string>
-  <string name="pref_camera_scenemode_entry_nightindoor">Interior nocherniegu</string>
-  <string name="pref_camera_scenemode_entry_oldfilm">Película antigua</string>
-  <string name="pref_camera_scenemode_entry_pet">Mascota</string>
-  <string name="pref_camera_scenemode_entry_portrait">Retratu</string>
-  <string name="pref_camera_scenemode_entry_snow">Ñeve</string>
-  <string name="pref_camera_scenemode_entry_softskin">Piel suave</string>
   <string name="pref_camera_scenemode_entry_sports">Deportes</string>
-  <string name="pref_camera_scenemode_entry_spotlight">Focu de lluz</string>
-  <string name="pref_camera_scenemode_entry_steadyphoto">Semeya estable</string>
-  <string name="pref_camera_scenemode_entry_supernight">Nueche escura</string>
-  <string name="pref_camera_scenemode_entry_sweepstitch">Percorríu panorámicu</string>
-  <string name="pref_camera_scenemode_entry_text">Testu</string>
-  <string name="pref_camera_scenemode_entry_theatre">Teatru</string>
-  <string name="pref_camera_scenemode_entry_whiteboard">Pizarra</string>
   <!-- Settings screen, focus mode -->
-  <string name="pref_camera_focusmode_entry_continuous">Continuu</string>
-  <string name="pref_camera_focusmode_entry_mw_continuous">Continuu (MW)</string>
-  <string name="pref_camera_focusmode_entry_extended">Estendíu</string>
-  <string name="pref_camera_focusmode_entry_facedetect">Detección de cares</string>
-  <string name="pref_camera_focusmode_entry_facepriority">Prioridá de cares</string>
-  <string name="pref_camera_focusmode_entry_fixed">Fixu</string>
   <string name="pref_camera_focusmode_entry_normal">Normal</string>
-  <string name="pref_camera_focusmode_entry_portrait">Retratu</string>
-  <string name="pref_camera_focusmode_entry_hyperfocal">Hiperfocal</string>
   <!-- Color effects -->
-  <string name="pref_camera_coloreffect_entry_washed">Llaváu</string>
-  <string name="pref_camera_coloreffect_entry_vintage_warm">Antiguu caldiu</string>
-  <string name="pref_camera_coloreffect_entry_vintage_cold">Antiguu fríu</string>
-  <string name="pref_camera_coloreffect_entry_point_blue">Puntu azul</string>
-  <string name="pref_camera_coloreffect_entry_point_green">Puntu verde</string>
-  <string name="pref_camera_coloreffect_entry_point_red_yellow">Puntu encarnáu-mariellu</string>
-  <string name="pref_camera_coloreffect_entry_cartoonize">Viñetiar</string>
   <!-- Red eye flash mode title -->
-  <string name="pref_camera_flashmode_entry_redeye">Güeyos bermeyos</string>
-  <string name="pref_camera_flashmode_label_redeye">GÜEYOS BERMEYOS</string>
   <!-- Power shutter -->
-  <string name="pref_camera_power_shutter_title">Disparador c/botón d\'encendíu</string>
   <!-- Max brightness -->
-  <string name="pref_camera_max_brightness_title">Pantalla brillante</string>
   <!-- Touch focus duration -->
-  <string name="pref_camera_focustime_title">Duración del enfoque</string>
-  <string name="pref_camera_focustime_entry_0">0s</string>
-  <string name="pref_camera_focustime_entry_3">3s</string>
-  <string name="pref_camera_focustime_entry_5">5 s</string>
-  <string name="pref_camera_focustime_entry_10">10 s</string>
-  <string name="pref_camera_focustime_entry_infinite">Infinitu</string>
   <!-- Shutter speed -->
-  <string name="pref_camera_shutter_speed_title">Velocidá del obturador</string>
-  <string name="auto_hdr_enabled">Auto HDR activáu</string>
   <!-- Advanced options -->
 </resources>
diff --git a/res/values-ast-rES/qcomstrings.xml b/res/values-ast-rES/qcomstrings.xml
index eec68c731..040be2ae2 100644
--- a/res/values-ast-rES/qcomstrings.xml
+++ b/res/values-ast-rES/qcomstrings.xml
@@ -27,7 +27,7 @@
   <!-- 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] -->
   <!-- Auto exposure -->
-  <string name="pref_camera_autoexposure_title">Mou d\'Autoesposición</string>
+  <string name="pref_camera_autoexposure_title">Auto-esposición</string>
   <string name="pref_camera_autoexposure_entry_centerweighted">Ponderada al centru</string>
   <string name="pref_camera_autoexposure_entry_frameaverage">Media de marcos</string>
   <string name="pref_camera_autoexposure_entry_spotmetering">Midición puntual</string>
@@ -36,35 +36,17 @@
   <!-- Audio codec -->
   <string name="pref_camera_audioencoder_title">Códec d\'audiu</string>
   <!-- Skin tone enhancement -->
-  <string name="pref_camera_skinToneEnhancement_title">Meyora del tonu la piel</string>
   <!-- Zero shutter lag-->
-  <string name="pref_camera_zsl_title">Desaniciar retrasu del disparador</string>
   <!-- Autofocus zone -->
-  <string name="pref_camera_selectablezoneaf_title">Zona d\'enfoque automáticu</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Auto</string>
-  <string name="pref_camera_selectablezoneaf_entry_centerweighted">Ponderáu al centru</string>
-  <string name="pref_camera_selectablezoneaf_entry_frameaverage">Media de marcos</string>
-  <string name="pref_camera_selectablezoneaf_entry_spotmetering">Midición puntual</string>
   <!-- Advanced features -->
-  <string name="pref_camera_advanced_features_title">Carauterístiques avanzaes</string>
-  <string name="pref_camera_advanced_feature_entry_none">Dengún</string>
-  <string name="pref_camera_advanced_feature_entry_multi_touch_focus">Enfoque multi-toque</string>
   <!-- Manual exposure -->
   <string name="pref_camera_manual_exp_title">Esposición manual</string>
   <string name="pref_camera_manual_exp_entry_ISO_priority">Prioridá ISO</string>
-  <string name="pref_camera_manual_exp_entry_exptime_priority">Prioridá de tiempu d\'esposición</string>
-  <string name="pref_camera_manual_exp_entry_user_setting">Axuste d\'usuariu</string>
-  <string name="pref_camera_manual_exp_entry_off">Apagar</string>
   <!-- Manual white balance -->
   <string name="pref_camera_manual_wb_title">Balance manual de blancu</string>
   <string name="pref_camera_manual_wb_entry_color_temperature">Temperatura de color</string>
-  <string name="pref_camera_manual_wb_entry_rbgb_gains">Ganancies RBGB</string>
-  <string name="pref_camera_manual_wb_entry_off">Apagar</string>
   <!-- Manual focus -->
-  <string name="pref_camera_manual_focus_title">Enfoque manual</string>
-  <string name="pref_camera_manual_focus_entry_scale_mode">Mou d\'escala</string>
-  <string name="pref_camera_manual_focus_entry_diopter_mode">Mou dioptría</string>
-  <string name="pref_camera_manual_focus_entry_off">Apagar</string>
   <!-- Still More -->
   <!-- Video HDR-->
   <string name="pref_camera_video_hdr_title">Videu HDR</string>
@@ -79,26 +61,14 @@
   <!-- Video TNR -->
   <string name="pref_camera_video_tnr_title">Mou de videu TNR</string>
   <!-- Face detection -->
-  <string name="pref_camera_facedetection_title">Detección de cares</string>
+  <string name="pref_camera_facedetection_title">Deteición de cares</string>
   <!-- Selfie Flash -->
-  <string name="pref_selfie_flash_title">Flash pa selfie</string>
   <!-- Red eye reduction -->
-  <string name="pref_camera_redeyereduction_title">Amenorgamientu de güeyos bermeyos</string>
   <!-- AE bracketing -->
-  <string name="pref_camera_ae_bracket_hdr_title">Esposición HDR automática</string>
   <!-- High-framerate recording -->
-  <string name="pref_camera_hfr_title">Grabación d\'alta velocidá de fotogrames</string>
-  <string name="pref_camera_hfr_entry_off">Desactiváu</string>
-  <string name="pref_camera_hfr_entry_2x">Cámara lenta a 60 FPS</string>
-  <string name="pref_camera_hfr_entry_3x">Cámara lenta a 90 FPS</string>
-  <string name="pref_camera_hfr_entry_4x">Cámara lenta a 120 FPS</string>
-  <string name="pref_camera_hfr_entry_8x">Cámara lenta a 240 FPS</string>
-  <string name="pref_camera_hfr_entry_hsr_60">Alta velocidá a 60 FPS</string>
-  <string name="pref_camera_hfr_entry_hsr_90">Alta velocidá a 90 FPS</string>
-  <string name="pref_camera_hfr_entry_hsr_120">Alta velocidá a 90 FPS</string>
   <!-- See More -->
   <!-- Denoise -->
-  <string name="pref_camera_denoise_title">Mou reductor de ruiu</string>
+  <string name="pref_camera_denoise_title">Amenorgar ruíu</string>
   <!-- ISO -->
   <string name="pref_camera_iso_title">ISO</string>
   <string name="pref_camera_iso_entry_auto">Auto</string>
@@ -131,34 +101,18 @@
   <string name="pref_camera_iso_entry_iso6400">ISO6400</string>
   <string name="pref_camera_iso_entry_iso12800">ISO12800</string>
   <!-- Antibanding -->
-  <string name="pref_camera_antibanding_title">Anti-bandéu</string>
   <string name="pref_camera_antibanding_entry_0">Auto</string>
   <string name="pref_camera_antibanding_entry_1">50 Hz (Europa)</string>
   <string name="pref_camera_antibanding_entry_2">60 Hz (EE.XX)</string>
   <!-- Color effect -->
   <string name="pref_camera_coloreffect_title">Efeutu de color</string>
-  <string name="pref_camera_coloreffect_entry_none">Nengún</string>
-  <string name="pref_camera_coloreffect_entry_mono">Mono</string>
   <string name="pref_camera_coloreffect_entry_sepia">Sepia</string>
   <string name="pref_camera_coloreffect_entry_negative">Negativu</string>
   <!-- Color effect that overexposes and reverses some of the tones. -->
-  <string name="pref_camera_coloreffect_entry_solarize">Solarizar</string>
-  <string name="pref_camera_coloreffect_entry_posterize">Posterizar</string>
-  <string name="pref_camera_coloreffect_entry_aqua">Agua</string>
-  <string name="pref_camera_coloreffect_entry_emboss">Realzar</string>
-  <string name="pref_camera_coloreffect_entry_sketch">Croquis</string>
-  <string name="pref_camera_coloreffect_entry_neon">Neón</string>
-  <string name="pref_camera_coloreffect_entry_pastel">Pastel</string>
-  <string name="pref_camera_coloreffect_entry_mosaic">Mosaicu</string>
-  <string name="pref_camera_coloreffect_entry_redtint">Tinta encarnao</string>
-  <string name="pref_camera_coloreffect_entry_bluetint">Tinta azul</string>
-  <string name="pref_camera_coloreffect_entry_greentint">Tinta verde</string>
   <!-- Stabilization -->
-  <string name="pref_camera_dis_title">Estabilización dixital d\'imaxe</string>
+  <string name="pref_camera_dis_title">Estabilización</string>
   <!-- Face recognition -->
-  <string name="pref_camera_facerc_title">Reconocimientu de cares</string>
   <!-- Sharpness -->
-  <string name="pref_camera_sharpness_title">Nitidez</string>
   <string name="pref_camera_sharpness_entry_level0">Nivel 0</string>
   <string name="pref_camera_sharpness_entry_level1">Nivel 1</string>
   <string name="pref_camera_sharpness_entry_level2">Nivel 2 (por defeutu)</string>
@@ -193,9 +147,7 @@
   <string name="pref_camera_saturation_entry_level9">Nivel 9</string>
   <string name="pref_camera_saturation_entry_level10">Nivel 10</string>
   <!-- Picture format -->
-  <string name="pref_camera_picture_format_title">Formatu d\'imaxe</string>
   <!-- Picture quality -->
-  <string name="pref_camera_jpegquality_title">Calidá d\'imaxe</string>
   <string name="pref_camera_jpegquality_entry_0">55%</string>
   <string name="pref_camera_jpegquality_entry_1">65% (normal)</string>
   <string name="pref_camera_jpegquality_entry_2">75% (fina)</string>
@@ -205,17 +157,12 @@
   <!-- Histogram -->
   <string name="pref_camera_histogram_title">Histograma</string>
   <!-- Auto scene detection -->
-  <string name="pref_camera_scenedetect_title">Auto Detección d\'Escenes</string>
   <!-- Continuous shot -->
-  <string name="pref_camera_longshot_title">Disparu continuu</string>
   <!-- Auto HDR -->
-  <string name="pref_camera_auto_hdr_title">HDR auto</string>
   <!-- HDR mode -->
   <string name="pref_camera_hdr_mode_title">Mou HDR</string>
   <string name="pref_camera_hdr_mode_entry_sensor">Sensor HDR</string>
-  <string name="pref_camera_hdr_mode_entry_multi_frame">HDR de marcos múltiples</string>
   <!-- HDR needs 1x frame -->
-  <string name="pref_camera_hdr_need_1x_title">HDR necesita marcu de 1x</string>
   <!-- Video rotation -->
   <string name="pref_camera_video_rotation_title">Voltéu de videu</string>
   <string name="pref_camera_video_rotation_entry_0">0 graos</string>
@@ -229,42 +176,23 @@
   <!-- Misc -->
   <!-- The alias of CameraActivity for gesture operation -->
   <string name="camera_gesture_title">Llanzar cámara</string>
-  <string name="all_in_focus">Too nel focu</string>
-  <string name="refocus_toast">Pa volver a enfocar la postrer semeya, primi equí</string>
   <!-- Toast messages -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for High-framerate recording mode -->
-  <string name="error_app_unsupported_hfr_selection">La grabación d\'alta velocidá de fotogrames nun ye compatible cuando s\'usa la estabilización/TimeLapse/HDR.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for Slow motion mode -->
-  <string name="error_app_unsupported_hfr">El mou de cámara lenta nun ye compatible col tamañu del videu esbilláu. Esbilla un tamañu de videu inferior</string>
   <!-- The message is shown in toast when the app encounters an unsupported resolution for Stabilization mode -->
-  <string name="error_app_unsupported_dis">La estabilización nun ye compatible col tamañu del videu esbilláu. Esbilla un tamañu de videu inferior</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for High speed mode -->
-  <string name="error_app_unsupported_hsr">Nun ta sofitáu\'l mou d\'alta velocidá pal tamañu de videu esbilláu. Esbilláu un tamañu de videu más baxu</string>
   <!-- The message is shown in dialog when the app encounters an unsupported video codec for HFR mode -->
-  <string name="error_app_unsupported_hfr_codec">Namái se sofita la codificación de videu H264 al tar habilitáu HFR</string>
   <!-- The message is shown in dialog when the app encounters an unsupported video resolution-->
-  <string name="error_app_unsupported">Resolución de videu non sofitada nesti tipu de codificador</string>
   <!--The message is shown in dialog when the raw snapshot is selected in Zero shutter lag mode-->
-  <string name="error_app_unsupported_raw">El formatu d\'imaxe RAW nun ye compatible col retrasu de obturador en mou cero. Seleiciona JPEG</string>
-  <string name="msg_cancel_longshot_for_limited_memory">La memoria ta escosando, encaboxando\'l disparu continuu</string>
   <!-- Toast showing non-supported functionality for flash in AE bracket -->
-  <string name="flash_aebracket_message">El flash nun ye compatible col mou AE bracketing</string>
   <!-- toast message for storage location switch -->
-  <string name="on_switch_save_path_to_sdcard">Nun ye abondu l\'espaciu nel almacenamientu internu, cambióse al allugamientu d\'almacenamientu na tarxeta SD</string>
   <!-- The message is shown in toast when click showOnMap Menu and there is no map app -->
-  <string name="map_activity_not_found_err">Nun hai aplicación de mapes instalada dala p\'amosar l\'allugamientu</string>
   <!-- Continous shot enable message -->
-  <string name="longshot_enable_message">Carauterístiques avanzaes que nun tán sofitaes nel mou de disparu continuu</string>
   <!-- Advance features enable message -->
-  <string name="advance_feature_enable_msg">Nun tán sofitáu\'l disparu continuu al tar habilitaes les carauterístiques avanzaes</string>
   <!-- Toast after enable HDR function to inform continuous shot has disabled -->
-  <string name="HDR_disable_continuous_shot">Habilitar HDR deshabilitará\'l disparu continuu</string>
   <!-- Toast after enable advanced capture function to inform continuous shot has disabled -->
-  <string name="advanced_capture_disable_continuous_shot">Habilitar la captura avanzada deshabilitará\'l disparu continuu</string>
   <!-- Toast after enable 2k4k video quality to inform IS has disabled -->
-  <string name="video_quality_4k_disable_IS">Habilitar el tamañu de videu 4k deshabilitará la estabilización</string>
   <!-- Toast after 2k4k video is enabled to inform SeeMore has been disabled -->
-  <string name="video_quality_4k_disable_SeeMore">SeeMore nun pue habilitase nel videu a 4k</string>
   <!-- Toast after SeeMore has been enabled to show CDS is disabled -->
   <!-- Toast after SeeMore has been enabled to show TNR is disabled -->
   <!-- TODO: Remove these? -->
diff --git a/res/values-ast-rES/strings.xml b/res/values-ast-rES/strings.xml
index ea43b970f..685de524b 100644
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -30,8 +30,8 @@
   <string name="delete">Desaniciar</string>
   <!-- String Delete the selected media item(s) [CHAR LIMIT=50] -->
   <plurals name="delete_selection">
-    <item quantity="one">Desaniciar l\'elementu esbilláu?</item>
-    <item quantity="other">Desaniciar los elementos esbillaos?</item>
+    <item quantity="one">¿Desaniciar l\'elementu esbilláu?</item>
+    <item quantity="other">¿Desaniciar los elementos esbillaos?</item>
   </plurals>
   <string name="share">Compartir</string>
   <string name="share_panorama">Compartir panorámica</string>
@@ -61,130 +61,85 @@
     <item quantity="other">%1$d esbillaos</item>
   </plurals>
   <!-- String indicating timestamp of photo or video -->
-  <string name="show_on_map">Amosar nel mapa</string>
-  <string name="rotate_left">Xirar a la esquierda</string>
-  <string name="rotate_right">Xirar a la derecha</string>
+  <string name="rotate_left">Voltiar a esquierda</string>
   <!-- String used as a menu label. The user can choose to edit the image
          [CHAR_LIMIT=20]-->
   <string name="edit">Editar</string>
   <!-- The title of the menu item to let user crop the image. [CHAR LIMIT=15] -->
-  <string name="crop_action">Recortar</string>
   <!-- The title of the menu item to let user trim the video. [CHAR LIMIT=15] -->
-  <string name="trim_action">Recortar</string>
   <!-- The title of the menu item to let user set the image as background etc. [CHAR LIMIT=15] -->
-  <string name="set_as">Afitar como</string>
   <!-- String indicating an error when playing the video. [CHAR LIMIT=30] -->
   <string name="video_err">Nun pue reproducise\'l videu.</string>
   <!-- Toast message shown when the cropped image has been saved in the
          %s folder (string: folder_download) [CHAR LIMIT=50]-->
-  <string name="crop_saved">
-        La imaxe recortada guardóse en <xliff:g id="FOLDER_NAME">%s</xliff:g>.</string>
   <!-- Text indicating the title of a media item in details window [CHAR LIMIT=14] -->
-  <string name="title">Títulu</string>
   <!-- Text indicating the description of a media item in details window [CHAR LIMIT=14] -->
-  <string name="description">Descripción</string>
   <!-- Text indicating the creation time of a media item in details window [CHAR LIMIT=14] -->
-  <string name="time">Hora</string>
   <!-- Text indicating the location of a media item in details window [CHAR LIMIT=14] -->
-  <string name="location">Llocalización</string>
+  <string name="location">Allugamientu</string>
   <!-- Text indicating the path of a media item in details window [CHAR LIMIT=14] -->
-  <string name="path">Camín</string>
   <!-- Text indicating the width of a media item in details window [CHAR LIMIT=14] -->
   <string name="width">Anchor</string>
   <!-- Text indicating the height of a media item in details window [CHAR LIMIT=14] -->
-  <string name="height">Altor</string>
   <!-- Text indicating the orientation of a media item in details window [CHAR LIMIT=14] -->
   <string name="orientation">Orientación</string>
   <!-- Text indicating the duration of a video item in details window [CHAR LIMIT=18] -->
   <string name="duration">Duración</string>
   <!-- Text indicating the mime type of a media item in details window [CHAR LIMIT=14] -->
-  <string name="mimetype">Tipu de MIME</string>
+  <string name="mimetype">Triba MIME</string>
   <!-- Text indicating the file size of a media item in details window [CHAR LIMIT=14] -->
-  <string name="file_size">Tamañu del ficheru</string>
   <!-- Text indicating the maker of a media item in details window [CHAR LIMIT=14] -->
-  <string name="maker">Creador</string>
   <!-- Text indicating the model of a media item in details window [CHAR LIMIT=14] -->
-  <string name="model">Modelu</string>
   <!-- Text indicating flash info of a media item in details window [CHAR LIMIT=14] -->
-  <string name="flash">Flash</string>
   <!-- Text indicating aperture of a media item in details window [CHAR LIMIT=14] -->
-  <string name="aperture">Apertura</string>
   <!-- Text indicating the focal length of a media item in details window [CHAR LIMIT=14] -->
-  <string name="focal_length">Llonxitú focal</string>
   <!-- Text indicating the white balance of a media item in details window [CHAR LIMIT=18] -->
-  <string name="white_balance">Balance de blancos</string>
   <!-- Text indicating the exposure time of a media item in details window [CHAR LIMIT=14] -->
-  <string name="exposure_time">Tiempu d\'esposición</string>
   <!-- Text indicating the ISO speed rating of a media item in details window [CHAR LIMIT=14] -->
   <string name="iso">ISO</string>
   <!-- String indicating the time units in seconds. [CHAR LIMIT=8] -->
   <!-- String indicating the length units in milli-meters. [CHAR LIMIT=8] -->
   <string name="unit_mm">mm</string>
   <!-- String indicating how camera shooting feature is used. [CHAR LIMIT=12] -->
-  <string name="manual">Manual</string>
   <!-- String indicating how camera shooting feature is used. [CHAR LIMIT=12 -->
-  <string name="auto">Auto</string>
   <!-- String indicating camera flash is fired. [CHAR LIMIT=14] -->
-  <string name="flash_on">Flash activáu</string>
   <!-- String indicating camera flash is not used. [CHAR LIMIT=14] -->
-  <string name="flash_off">Ensin flash</string>
   <!-- String indicating image width or height is unknown. [CHAR LIMIT=14] -->
-  <string name="unknown">Desconocíu</string>
   <!-- Toast message shown after we try to make a local album available offline
          [CHAR LIMIT=150] -->
   <string name="try_to_set_local_album_available_offline">
-        L\'elementu almacenóse de forma llocal y ta disponible ensin conexón.</string>
+        Esti elementu atroxóse de mou llocal y ta disponible ensin conexón.</string>
   <!-- The content of a dialog showing trimming in progress. [CHAR LIMIT=30] -->
-  <string name="please_wait">Espera</string>
   <!-- Text to show with progress bar while stitching a photo sphere. 'Photo sphere' is a product name. [CHAR LIMIT=35]-->
-  <string name="rendering_photo_sphere">Procesando semeya esférica</string>
   <!-- title for the dialog showing the error of camera hardware -->
-  <string name="camera_error_title">Fallu de cámara</string>
   <!-- message for the dialog showing the error of camera hardware -->
-  <string name="cannot_connect_camera">Nun pue accedese a la cámara.</string>
   <!-- message for the dialog showing the camera is disabled because of security policies. Camera cannot be used. -->
-  <string name="camera_disabled">Inhabilitóse la cámara por polítiques de seguridá.</string>
   <!-- message for the dialog showing that the app does not have sufficient permissions [CHAR LIMIT=NONE] -->
   <!-- Dialog "Dismiss" button. Closes the dialog [CHAR LIMIT=12]-->
   <!-- alert to the user to wait for some operation to complete -->
-  <string name="wait">Por favor, espera\u2026</string>
   <!-- alert to the user that an SD card must be installed before using the camera -->
-  <string name="no_storage" product="default">Pa poder usar la cámara, inxerta una tarxeta SD.</string>
   <!-- alert to the user that the SD card is being disk-checked -->
-  <string name="preparing_sd" product="default">Tresnando tarxeta SD\u2026</string>
   <!-- alert to the user that the camera fails to read or write the SD card. -->
-  <string name="access_sd_fail" product="default">Nun pudo accedese a la tarxeta SD.</string>
   <!-- A label that overlays on top of the preview frame to indicate the camcorder is in time lapse mode [CHAR LIMIT=35] -->
-  <string name="time_lapse_title">Grabación a intervalos de tiempu</string>
   <!-- Screen display message during image capture to indicate that the capture is in progress, like during HDR+. [CHAR LIMIT=20] -->
-  <string name="capturing">Capturando</string>
   <!-- Settings screen, camera selection dialog title. Users can select a camera from the phone (front-facing or back-facing). [CHAR LIMIT=20] -->
-  <string name="pref_camera_id_title">Seleicionar cámara</string>
   <!-- In select camera setting, back facing camera. [CHAR LIMIT=14] -->
-  <string name="pref_camera_id_entry_back">Atrás</string>
   <!-- In select camera setting, front-facing camera. [CHAR LIMIT=14] -->
-  <string name="pref_camera_id_entry_front">Delantera</string>
   <!-- Settings screen, setting title text -->
-  <string name="pref_camera_recordlocation_title">Amestar llocalización</string>
   <!--  Label for record location preference [CHAR LIMIT=50] -->
-  <string name="pref_camera_location_label">LLOCALIZACIÓN</string>
+  <string name="pref_camera_location_label">ALLUGAMIENTU</string>
   <!-- Title for countdown timer on camera settings screen [CHAR LIMIT=30]-->
-  <string name="pref_camera_timer_title">Temporizador de cuenta atrás</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 segundu</item>
     <item quantity="other">%d segundos</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">Usar pitíu</string>
   <!-- Entry of a on/off setting. The setting is turned off. [CHAR LIMIT=15] -->
-  <string name="setting_off">Non</string>
   <!-- Entry of a on/off setting. The setting is turned on. [CHAR LIMIT=15] -->
-  <string name="setting_on">Activáu</string>
   <!-- The value of a camera preference indicating the setting is off. -->
   <!-- The value of a camera preference indicating the setting is on. -->
   <!-- The Video quality settings in preference [CHAR LIMIT=21] -->
-  <string name="pref_video_quality_title">Calidá de videu</string>
   <!-- The default quality value is NULL -->
   <!-- Video quality setting entry.
     Videos will be recorded in 4k DCI quality. [CHAR LIMIT=24] -->
@@ -195,96 +150,47 @@
   <!-- Video quality setting entry. Videos will be recorded in 480p quality. [CHAR LIMIT=24] -->
   <!-- Describes the preference dialog for choosing interval between frame capture for
     time lapse recording. Appears at top of the dialog. [CHAR LIMIT=30] -->
-  <string name="pref_video_time_lapse_frame_interval_title">Intervalu de tiempu</string>
   <!-- Settings screen, Camera setting category title -->
-  <string name="pref_camera_settings_category">Axustes de la cámara</string>
   <!-- Settings screen, Camcorder setting category title -->
-  <string name="pref_camcorder_settings_category">Configuración de videocámara</string>
   <!-- Settings screen, Picture size title -->
-  <string name="pref_camera_picturesize_title">Tamañu imaxe</string>
   <!-- Settings screen, Focus mode title -->
-  <string name="pref_camera_focusmode_title">Mou d\'enfoque</string>
   <!-- Settings screen, Focus mode dialog radio button choices -->
-  <string name="pref_camera_focusmode_entry_auto">Automáticu</string>
   <!-- A setting that lets the camera focus into infinity. [CHAR LIMIT=20] -->
-  <string name="pref_camera_focusmode_entry_infinity">Infinitu</string>
   <!-- A setting that lets the camera operate in macro focus mode for nearby objects. [CHAR LIMIT=20] -->
-  <string name="pref_camera_focusmode_entry_macro">Macro</string>
   <!-- Menu, focus mode labels [CHAR LIMIT=50] -->
-  <string name="pref_camera_focusmode_label_auto">AUTOMÁTICU</string>
-  <string name="pref_camera_focusmode_label_infinity">INFINITU</string>
-  <string name="pref_camera_focusmode_label_macro">MACRO</string>
   <!-- Default flash mode setting.-->
   <!-- Value for flash off setting-->
   <!-- Settings screen, Flash mode title -->
-  <string name="pref_camera_flashmode_title">Flash</string>
   <!-- flash label [CHAR LIMIT=50] -->
-  <string name="pref_camera_flashmode_label">MOU FLASH</string>
   <!-- Settings screen, Flash mode 'auto'. [CHAR LIMIT=12] -->
-  <string name="pref_camera_flashmode_entry_auto">Automáticu</string>
   <!-- Settings screen, Flash mode 'alway on'. [CHAR LIMIT=12] -->
-  <string name="pref_camera_flashmode_entry_on">Activáu</string>
   <!-- Settings screen, Flash mode 'always off'. [CHAR LIMIT=12] -->
-  <string name="pref_camera_flashmode_entry_off">Non</string>
   <!-- Menu, flash mode labels [CHAR LIMIT=50] -->
-  <string name="pref_camera_flashmode_label_auto">FLASH AUTOMÁTICU</string>
-  <string name="pref_camera_flashmode_label_on">FLASH ACTIVÁU</string>
-  <string name="pref_camera_flashmode_label_off">FLASH DESACTIVÁU</string>
   <!-- Default videocamera flash mode setting.-->
   <!-- Default white balance setting. -->
   <!-- Settings screen, white balance title -->
-  <string name="pref_camera_whitebalance_title">Balance de blancos</string>
   <!-- Menu, white balance label -->
-  <string name="pref_camera_whitebalance_label">BALANCE DE BLANCOS</string>
   <!-- Settings screen, White balance dialog radio button choices -->
-  <string name="pref_camera_whitebalance_entry_auto">Automáticu</string>
-  <string name="pref_camera_whitebalance_entry_incandescent">Incandescente</string>
-  <string name="pref_camera_whitebalance_entry_daylight">Lluz natural</string>
-  <string name="pref_camera_whitebalance_entry_fluorescent">Fluorescente</string>
-  <string name="pref_camera_whitebalance_entry_cloudy">Ñuble</string>
   <!-- Menu, White balance labels [CHAR LIMIT=50] -->
-  <string name="pref_camera_whitebalance_label_auto">AUTOMÁTICU</string>
-  <string name="pref_camera_whitebalance_label_incandescent">INCANDESCENTE</string>
-  <string name="pref_camera_whitebalance_label_daylight">LLUZ NATURAL</string>
-  <string name="pref_camera_whitebalance_label_fluorescent">FLUORESCENTE</string>
-  <string name="pref_camera_whitebalance_label_cloudy">ÑUBLE</string>
   <!-- Default scene mode setting. -->
   <!-- Settings screen, Select Scene mode -->
-  <string name="pref_camera_scenemode_title">Mou d\'escena</string>
   <!-- Settings menu, scene mode choices [CHAR LIMIT=16] -->
-  <string name="pref_camera_scenemode_entry_auto">Automáticu</string>
   <!-- Scene mode that uses HDR plus (better HDR) [CHAR LIMIT=16] -->
-  <string name="pref_camera_scenemode_entry_hdr_plus">HDR+</string>
   <!-- Scene mode that uses HDR (high dynamic range) [CHAR LIMIT=16] -->
-  <string name="pref_camera_scenemode_entry_hdr">HDR</string>
   <!-- Scene mode to turn on HDR (better high dynamic range) [CHAR LIMIT=50] -->
-  <string name="pref_camera_scenemode_entry_turn_hdr_plus_on">HDR+ ON</string>
   <!-- Scene mode to turn off HDR (better high dynamic range) [CHAR LIMIT=50] -->
-  <string name="pref_camera_scenemode_entry_turn_hdr_plus_off">HDR+ OFF</string>
   <!-- Scene mode to turn on HDR (high dynamic range) [CHAR LIMIT=50] -->
-  <string name="pref_camera_scenemode_entry_turn_hdr_on">HDR ON</string>
   <!-- Scene mode to turn off HDR (high dynamic range) [CHAR LIMIT=50] -->
-  <string name="pref_camera_scenemode_entry_turn_hdr_off">HDR OFF</string>
   <!-- Scene mode that takes an image quickly with little motion blur. [CHAR LIMIT=16] -->
-  <string name="pref_camera_scenemode_entry_action">Aición</string>
   <!-- Scene mode that takes long exposures to capture night scenes without flash. [CHAR LIMIT=16] -->
-  <string name="pref_camera_scenemode_entry_night">Nueche</string>
   <!-- Scene mode optimized for taking images in the sunset. [CHAR LIMIT=16] -->
-  <string name="pref_camera_scenemode_entry_sunset">Atapecer</string>
   <!-- Scene mode optimized for taking indoor low-lights pictures. [CHAR LIMIT=16] -->
-  <string name="pref_camera_scenemode_entry_party">Folixa</string>
   <!-- Settings menu, scene mode labels [CHAR LIMIT=50] -->
-  <string name="pref_camera_scenemode_label_auto">NENGÚN</string>
   <!-- Scene mode that takes an image quickly with little motion blur. [CHAR LIMIT=50] -->
-  <string name="pref_camera_scenemode_label_action">AICIÓN</string>
   <!-- Scene mode that takes long exposures to capture night scenes without flash. [CHAR LIMIT=50] -->
-  <string name="pref_camera_scenemode_label_night">NUECHE</string>
   <!-- Scene mode optimized for taking images in the sunset. [CHAR LIMIT=50] -->
-  <string name="pref_camera_scenemode_label_sunset">ATAPECER</string>
   <!-- Scene mode optimized for taking indoor low-lights pictures. [CHAR LIMIT=50] -->
-  <string name="pref_camera_scenemode_label_party">FOLIXA</string>
   <!-- Settings menu countdown timer off [CHAR LIMIT=50] -->
-  <string name="pref_camera_countdown_label_off">TEMPORIZADOR DESACTIVÁU</string>
   <!-- Settings menu countdown timer 1 second [CHAR LIMIT=50] -->
   <string name="pref_camera_countdown_label_one">1 SEGUNDU</string>
   <!-- Settings menu countdown timer 3 seconds [CHAR LIMIT=50] -->
@@ -294,112 +200,63 @@
   <!-- Settings menu countdown timer 15 seconds [CHAR LIMIT=50] -->
   <string name="pref_camera_countdown_label_fifteen">15 SEGUNDOS</string>
   <!-- Toast after trying to select a setting that is not allowed to change in scene mode [CHAR LIMIT=NONE] -->
-  <string name="not_selectable_in_scene_mode">Nun pue seleicionase nel mou d\'escena.</string>
   <!-- Exposure settings in preference -->
-  <string name="pref_exposure_title">Esposición</string>
   <!--  menu label exposure compensation [CHAR LIMIT=50] -->
-  <string name="pref_exposure_label">ESPOSICIÓN</string>
   <!-- Default HDR entry value -->
   <!-- Default HDR+ entry value -->
   <!-- HDR label ON [CHAR LIMIT=60] -->
-  <string name="pref_camera_hdr_label">HDR</string>
   <!-- switch camera label back [CHAR LIMIT=60] -->
-  <string name="pref_camera_id_label_back">CÁMARA FRONTAL</string>
   <!-- switch camera label front [CHAR LIMIT=60] -->
-  <string name="pref_camera_id_label_front">CÁMARA TRASERA</string>
   <!-- Dialog "OK" button. Dismisses dialog. -->
-  <string name="dialog_ok">Aceutar</string>
   <!-- Low-memory dialog message [CHAR LIMIT=NONE] -->
-  <string name="spaceIsLow_content" product="default">Nun hai espaciu na tarxeta SD. Cambia la configuración de calidá o desanicia dalgunes imáxenes o otros ficheros.</string>
   <!-- Camera format string for new image files. Passed to java.text.SimpleDateFormat. -->
   <!-- Video Camera format string for new video files. Passed to java.text.SimpleDateFormat. -->
   <!-- Filename prefix for panorama output. -->
   <!-- The message shown when video record reaches size limit. -->
-  <string name="video_reach_size_limit">Algamóse\'l tamañu máximu.</string>
+  <string name="video_reach_size_limit">Algamóse la llende de tamañu.</string>
   <!-- The text shown when the panorama panning speed is to fast [CHAR LIMIT=16] -->
-  <string name="pano_too_fast_prompt">Mui rápidu</string>
   <!-- The text shown in the progress dialog when panorama preview is generating in the background [CHAR LIMIT=30] -->
-  <string name="pano_dialog_prepare_preview">Preparando mou panorámicu</string>
   <!-- The text shown in the dialog when panorama saving failed [CHAR LIMIT=40] -->
-  <string name="pano_dialog_panorama_failed">Fallu al guardar imaxe panorámica.</string>
   <!-- The text shown on the dialog title in the dialogs for Panorama [CHAR LIMIT=12] -->
-  <string name="pano_dialog_title">Panorámicu</string>
   <!-- The text shown on the top-left corner of the screen to indicate the capturing is on going [CHAR LIMIT=27] -->
-  <string name="pano_capture_indication">Capturando panorámica</string>
   <!-- The text shown in the progress dialog when waiting for previous panorama finishing [CHAR LIMIT=40] -->
-  <string name="pano_dialog_waiting_previous">Esperando semeya panorámica anterior</string>
   <!-- The text shown on the bottom-left corner of the screen to indicate that the saving is in process [CHAR LIMIT=13] -->
-  <string name="pano_review_saving_indication_str">Guardando\u2026</string>
   <!-- The text shown on the screen to indicate that the panorama is rendering [CHAR LIMIT=27] -->
-  <string name="pano_review_rendering">Creando panorámica</string>
   <!-- Toast telling users tapping on the viewfinder will trigger autofocus [CHAR LIMIT=28] -->
-  <string name="tap_to_focus">Toca pa enfocar.</string>
   <!-- Default effect setting that clears the effect. -->
   <!-- Title of video effect setting popup window -->
-  <string name="pref_video_effect_title">Efeutos</string>
   <!-- Effect setting item that clear the effect. [CHAR LIMIT=14] -->
-  <string name="effect_none">Nengún</string>
   <!-- Effect setting item that squeezes the face. [CHAR LIMIT=14] -->
-  <string name="effect_goofy_face_squeeze">Comprimir</string>
   <!-- Effect setting item that makes eyes big. [CHAR LIMIT=14] -->
-  <string name="effect_goofy_face_big_eyes">Güeyos grandes</string>
   <!-- Effect setting item that makes mouth big. [CHAR LIMIT=14] -->
-  <string name="effect_goofy_face_big_mouth">Boca grande</string>
   <!-- Effect setting item that makes mouth small. [CHAR LIMIT=14] -->
-  <string name="effect_goofy_face_small_mouth">Boca pequeña</string>
   <!-- Effect setting item that makes nose big. [CHAR LIMIT=14] -->
-  <string name="effect_goofy_face_big_nose">Nariz grande</string>
   <!-- Effect setting item that makes eyes small. [CHAR LIMIT=14] -->
-  <string name="effect_goofy_face_small_eyes">Güeyos pequeños</string>
   <!-- Effect setting item that replaces background with Android in Space. [CHAR LIMIT=14] -->
-  <string name="effect_backdropper_space">Nel espaciu</string>
   <!-- Effect setting item that replaces background with a sunset. [CHAR LIMIT=14] -->
-  <string name="effect_backdropper_sunset">Atapecer</string>
   <!-- Effect setting item that replaces background with video from gallery. [CHAR LIMIT=14] -->
-  <string name="effect_backdropper_gallery">El to videu</string>
   <!-- Toast telling users tapping on the viewfinder will take a picture [CHAR LIMIT=54] -->
-  <string name="video_snapshot_hint">Toca pa facer una semeya mientres grabes un videu.</string>
   <!-- Announcement telling users video recording has just started [CHAR LIMIT=NONE] -->
-  <string name="video_recording_started">Anicióse la grabación de videu.</string>
   <!-- Announcement telling users video recording has just stopped [CHAR LIMIT=NONE] -->
-  <string name="video_recording_stopped">La grabación de videu detúvose.</string>
   <!-- A button in effect setting popup to clear the effect. [CHAR LIMIT=26] -->
-  <string name="clear_effects">Quitar efeutos</string>
   <!-- Title of category for silly face effects. [CHAR LIMIT=26] -->
-  <string name="effect_silly_faces">CARES GRACIOSES</string>
   <!-- Title of category for background replacement effects. [CHAR LIMIT=26] -->
-  <string name="effect_background">FONDU</string>
   <!-- The shutter button. [CHAR LIMIT = NONE] -->
-  <string name="accessibility_shutter_button">Disparador</string>
   <!-- The menu button. [CHAR LIMIT = NONE] -->
-  <string name="accessibility_menu_button">Botón Menú</string>
   <!-- The mode picker to switch between camera, video and panorama. [CHAR LIMIT = NONE] -->
-  <string name="accessibility_mode_picker">Cámara, videu o mou panorámicu</string>
   <!-- The check box in camera settings, such as store location. [CHAR LIMIT = NONE] -->
-  <string name="accessibility_check_box">Caxellu de verificación %1$s</string>
   <!-- The button to switch to Camera mode. [CHAR LIMIT = NONE] -->
-  <string name="accessibility_switch_to_camera">Cambiar a la cámara</string>
   <!-- The button to switch to Video mode. [CHAR LIMIT = NONE] -->
-  <string name="accessibility_switch_to_video">Cambiar a videu</string>
   <!-- The button to switch to Panorama mode. [CHAR LIMIT = NONE] -->
-  <string name="accessibility_switch_to_panorama">Cambiar a mou panorámicu</string>
   <!-- The button to switch to the Photo Sphere mode. [CHAR LIMIT = NONE] -->
-  <string name="accessibility_switch_to_photo_sphere">Cambiar a fotografía esférica</string>
   <!-- The button to switch to the high quality mode. [CHAR LIMIT = NONE] -->
-  <string name="accessibility_switch_to_gcam">Cambiar a calidá alta</string>
   <!-- The button in review mode indicating that the photo taking, video recording, and panorama saving session should be canceled [CHAR LIMIT = NONE] -->
-  <string name="accessibility_review_cancel">Revisar encaboxar</string>
   <!-- The button in review mode indicating that the taken photo/video is OK to be attached/uploaded [CHAR LIMIT = NONE] -->
-  <string name="accessibility_review_ok">Revisar fecho</string>
   <!-- button in review mode indicate the user want to retake another photo/video for attachment [
 CHAR LIMIT = NONE] -->
-  <string name="accessibility_review_retake">Revisar repetición</string>
   <!-- Default text for a button that can be toggled on and off. -->
-  <string name="capital_on">SÍ</string>
   <!-- Default text for a button that can be toggled on and off. -->
-  <string name="capital_off">NON</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_off">Non</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
   <string name="pref_video_time_lapse_frame_interval_500">0,5 segundos</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
@@ -429,7 +286,6 @@ CHAR LIMIT = NONE] -->
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
   <string name="pref_video_time_lapse_frame_interval_30000">0,5 minutos</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
-  <string name="pref_video_time_lapse_frame_interval_60000">1 minutu</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
   <string name="pref_video_time_lapse_frame_interval_90000">1,5 minutos</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
@@ -485,44 +341,25 @@ CHAR LIMIT = NONE] -->
   <!-- Hours: a unit of time for time lapse intervals. [CHAR LIMIT = 20] -->
   <string name="time_lapse_hours">hores</string>
   <!-- The button to confirm time-lapse setting changes. [CHAR LIMIT = 20] -->
-  <string name="time_lapse_interval_set">Fecho</string>
   <!-- Title in time interval picker for setting time interval. [CHAR LIMIT = 30]-->
-  <string name="set_time_interval">Afita intervalu de tiempu</string>
   <!-- Help text that is shown when the time lapse feature is turned off. [CHAR LIMIT = 180]-->
-  <string name="set_time_interval_help">L\'intervalu de tiempu ta desactiváu. Activa esta función p\'afitar un intervalu.</string>
   <!-- Title in timer setting for setting the duration for the countdown timer. [CHAR LIMIT = 50]-->
-  <string name="set_duration">Definir duración en segundos</string>
   <!-- On-screen hint during timer countdown for taking a photo. [CHAR LIMIT = 60]-->
-  <string name="count_down_title_text">Cuenta atrás pa facer una semeya</string>
   <!-- Title for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 50] -->
-  <string name="remember_location_title">¿Recordar llocalizaciones de les semeyes?</string>
   <!-- Message for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = None] -->
-  <string name="remember_location_prompt">Etiqueta les tos semeyes y vídeos coles llocalizaciones au se fexeron.\n\nOtres aplicaciones puen acceder a esta información, asina como a les imáxenes guardaes.</string>
   <!-- Negative answer for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 20] -->
-  <string name="remember_location_no">Non, gracies</string>
   <!-- Positive answer for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 20] -->
-  <string name="remember_location_yes">Sí</string>
   <!-- Camera menu labels -->
   <!-- more options label [CHAR LIMIT=50] -->
-  <string name="camera_menu_more_label">MÁS OPCIONES</string>
   <!-- settings label [CHAR LIMIT=50] -->
-  <string name="camera_menu_settings_label">AXUSTES</string>
   <!--  Tiny Planet -->
   <!-- Button to press for creating a tiny planet image. [CHAR LIMIT = 30] -->
-  <string name="create_tiny_planet">Crear Planeta nanu</string>
   <!-- Message shown while a tiny planet image is being saved. [CHAR LIMIT = 30] -->
-  <string name="saving_tiny_planet">Guardar Planeta nanu &#8230;</string>
   <!-- Label above a slider that let's the user set the zoom of a tiny planet image. [CHAR LIMIT = 15] -->
-  <string name="tiny_planet_zoom">Zoom</string>
   <!-- Label above a slider that let's the user set the rotation of a tiny planet image. [CHAR LIMIT = 15] -->
-  <string name="tiny_planet_rotate">Xirar</string>
   <!-- Crop -->
   <!-- Label for the save button in the crop activity action bar [CHAR LIMIT=20] -->
-  <string name="crop_save">Guardar</string>
   <!--  String shown when we cannot load the image when starting the activity [CHAR LIMIT=NONE] -->
-  <string name="cannot_load_image">Fallu al cargar la imaxe!</string>
   <!-- Label for album filmstrip button -->
-  <string name="switch_photo_filmstrip">Vista de tira de película</string>
   <!--  String shown when setting the homepage wallpaper in the background [CHAR LIMIT=NONE] -->
-  <string name="setting_wallpaper">Afitando fondu de pantalla</string>
 </resources>
diff --git a/res/values-bn-rBD/cm_strings.xml b/res/values-bn-rBD/cm_strings.xml
index 92cc92c93..4a5a6a887 100644
--- a/res/values-bn-rBD/cm_strings.xml
+++ b/res/values-bn-rBD/cm_strings.xml
@@ -18,6 +18,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- common aspect ratios -->
   <!-- aspect ratio greater than 16:9, so "widescreen" or "cinematic" -->
+  <string name="pref_camera_aspectratio_wide">প্রশস্ত</string>
   <!-- Format for entries in the picture size menu. Parameter one is aspect ratio,
          parameter two is size in megapixels, e.g. "(4:3) 12.1 megapixels"
          NOTE: for Chinese (zh) and Korean (ko) the pixel number (parameter two)
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index de8c7ca02..649e125d3 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -92,7 +92,7 @@
   <!-- Power shutter -->
   <string name="pref_camera_power_shutter_title">Obturador ràpid</string>
   <!-- Max brightness -->
-  <string name="pref_camera_max_brightness_title">Pantalla brillant</string>
+  <string name="pref_camera_max_brightness_title">Pantalla lluminosa</string>
   <!-- Touch focus duration -->
   <string name="pref_camera_focustime_title">Duració del focus tàctil</string>
   <string name="pref_camera_focustime_entry_0">0s</string>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index 673d253d8..a2d78b7f2 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/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> megapixel</string>
   <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">Μακροφωτογραφία+</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Μείωση motion blur</string>
diff --git a/res/values-en-rAU/cm_strings.xml b/res/values-en-rAU/cm_strings.xml
index 92cc92c93..dcff5206d 100644
--- a/res/values-en-rAU/cm_strings.xml
+++ b/res/values-en-rAU/cm_strings.xml
@@ -18,17 +18,92 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- common aspect ratios -->
   <!-- aspect ratio greater than 16:9, so "widescreen" or "cinematic" -->
+  <string name="pref_camera_aspectratio_wide">Wide</string>
   <!-- Format for entries in the picture size menu. Parameter one is aspect ratio,
          parameter two is size in megapixels, e.g. "(4:3) 12.1 megapixels"
          NOTE: for Chinese (zh) and Korean (ko) the pixel number (parameter two)
          will be multiplied by 100 as those languages want to count by ten thousands -->
+  <string name="pref_camera_megapixel_format">(<xliff:g id="ratio" example="16:9">%1$s</xliff:g>) <xliff:g id="pixels">%2$1.1f</xliff:g> megapixels</string>
   <!-- Settings screen, scene mode -->
+  <string name="pref_camera_scenemode_entry_refocus">Macro+</string>
+  <string name="pref_camera_scenemode_entry_antimotionblur">Motion blur reduction</string>
+  <string name="pref_camera_scenemode_entry_aqua">Aqua</string>
+  <string name="pref_camera_scenemode_entry_ar">Augmented reality</string>
+  <string name="pref_camera_scenemode_entry_asd">Best shot</string>
+  <string name="pref_camera_scenemode_entry_baby">Baby</string>
+  <string name="pref_camera_scenemode_entry_backgroundblur">Background blur</string>
+  <string name="pref_camera_scenemode_entry_backlight">Backlight</string>
+  <string name="pref_camera_scenemode_entry_backlightportrait">Backlight portrait</string>
+  <string name="pref_camera_scenemode_entry_barcode">Barcode</string>
+  <string name="pref_camera_scenemode_entry_beach">Beach</string>
+  <string name="pref_camera_scenemode_entry_beauty">Beauty</string>
+  <string name="pref_camera_scenemode_entry_candlelight">Candlelight</string>
+  <string name="pref_camera_scenemode_entry_cine">Cine</string>
+  <string name="pref_camera_scenemode_entry_closeup">Close-up</string>
+  <string name="pref_camera_scenemode_entry_dark">Dark</string>
+  <string name="pref_camera_scenemode_entry_dish">Dish</string>
+  <string name="pref_camera_scenemode_entry_duskdawn">Dusk/dawn</string>
+  <string name="pref_camera_scenemode_entry_document">Document</string>
+  <string name="pref_camera_scenemode_entry_fallcolor">Autumn</string>
+  <string name="pref_camera_scenemode_entry_fireworks">Fireworks</string>
+  <string name="pref_camera_scenemode_entry_flowers">Flowers</string>
+  <string name="pref_camera_scenemode_entry_handheldtwilight">Handheld twilight</string>
+  <string name="pref_camera_scenemode_entry_highsensitivity">High sensivity</string>
+  <string name="pref_camera_scenemode_entry_indoor">Indoor</string>
+  <string name="pref_camera_scenemode_entry_landscape">Landscape</string>
+  <string name="pref_camera_scenemode_entry_mix_illuminant">Mixed lighting</string>
+  <string name="pref_camera_scenemode_entry_mood">Mood</string>
+  <string name="pref_camera_scenemode_entry_nightportrait">Night portrait</string>
+  <string name="pref_camera_scenemode_entry_nightindoor">Night indoor</string>
+  <string name="pref_camera_scenemode_entry_oldfilm">Old film</string>
+  <string name="pref_camera_scenemode_entry_pet">Pet</string>
+  <string name="pref_camera_scenemode_entry_portrait">Portrait</string>
+  <string name="pref_camera_scenemode_entry_snow">Snow</string>
+  <string name="pref_camera_scenemode_entry_softskin">Soft skin</string>
+  <string name="pref_camera_scenemode_entry_sports">Sports</string>
+  <string name="pref_camera_scenemode_entry_spotlight">Spotlight</string>
+  <string name="pref_camera_scenemode_entry_steadyphoto">Steady photo</string>
+  <string name="pref_camera_scenemode_entry_supernight">Dark night</string>
+  <string name="pref_camera_scenemode_entry_sweepstitch">Sweep stitch</string>
+  <string name="pref_camera_scenemode_entry_text">Text</string>
+  <string name="pref_camera_scenemode_entry_theatre">Theatre</string>
+  <string name="pref_camera_scenemode_entry_whiteboard">Whiteboard</string>
   <!-- Settings screen, focus mode -->
+  <string name="pref_camera_focusmode_entry_continuous">Continuous</string>
+  <string name="pref_camera_focusmode_entry_mw_continuous">Continuous (MW)</string>
+  <string name="pref_camera_focusmode_entry_extended">Extended</string>
+  <string name="pref_camera_focusmode_entry_facedetect">Face detect</string>
+  <string name="pref_camera_focusmode_entry_facepriority">Face priority</string>
+  <string name="pref_camera_focusmode_entry_fixed">Fixed</string>
+  <string name="pref_camera_focusmode_entry_normal">Normal</string>
+  <string name="pref_camera_focusmode_entry_portrait">Portrait</string>
+  <string name="pref_camera_focusmode_entry_hyperfocal">Hyperfocal</string>
   <!-- Color effects -->
+  <string name="pref_camera_coloreffect_entry_washed">Washed</string>
+  <string name="pref_camera_coloreffect_entry_vintage_warm">Vintage warm</string>
+  <string name="pref_camera_coloreffect_entry_vintage_cold">Vintage cold</string>
+  <string name="pref_camera_coloreffect_entry_point_blue">Point blue</string>
+  <string name="pref_camera_coloreffect_entry_point_green">Point green</string>
+  <string name="pref_camera_coloreffect_entry_point_red_yellow">Point red-yellow</string>
+  <string name="pref_camera_coloreffect_entry_cartoonize">Cartoonise</string>
   <!-- Red eye flash mode title -->
+  <string name="pref_camera_flashmode_entry_redeye">Red-eye</string>
+  <string name="pref_camera_flashmode_label_redeye">RED EYE</string>
   <!-- Power shutter -->
+  <string name="pref_camera_power_shutter_title">Power shutter</string>
   <!-- Max brightness -->
+  <string name="pref_camera_max_brightness_title">Bright screen</string>
   <!-- Touch focus duration -->
+  <string name="pref_camera_focustime_title">Touch focus duration</string>
+  <string name="pref_camera_focustime_entry_0">0s</string>
+  <string name="pref_camera_focustime_entry_3">3s</string>
+  <string name="pref_camera_focustime_entry_5">5s</string>
+  <string name="pref_camera_focustime_entry_10">10s</string>
+  <string name="pref_camera_focustime_entry_infinite">Infinite</string>
   <!-- Shutter speed -->
+  <string name="pref_camera_shutter_speed_title">Shutter speed</string>
+  <string name="auto_hdr_enabled">Auto HDR enabled</string>
   <!-- Advanced options -->
+  <string name="developer_menu_enabled">You have enabled advanced camera options</string>
+  <string name="developer_menu_disabled">You have disabled advanced camera options</string>
 </resources>
diff --git a/res/values-en-rAU/qcomstrings.xml b/res/values-en-rAU/qcomstrings.xml
index 63b1dec74..4d688ac76 100644
--- a/res/values-en-rAU/qcomstrings.xml
+++ b/res/values-en-rAU/qcomstrings.xml
@@ -27,67 +27,247 @@
   <!-- 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] -->
   <!-- Auto exposure -->
+  <string name="pref_camera_autoexposure_title">Auto exposure</string>
+  <string name="pref_camera_autoexposure_entry_centerweighted">Centre weighted</string>
+  <string name="pref_camera_autoexposure_entry_frameaverage">Frame average</string>
+  <string name="pref_camera_autoexposure_entry_spotmetering">Spot metering</string>
   <!-- Video codec -->
+  <string name="pref_camera_videoencoder_title">Video codec</string>
   <!-- Audio codec -->
+  <string name="pref_camera_audioencoder_title">Audio codec</string>
   <!-- Skin tone enhancement -->
+  <string name="pref_camera_skinToneEnhancement_title">Skin tone enhancement</string>
   <!-- Zero shutter lag-->
+  <string name="pref_camera_zsl_title">Zero shutter lag</string>
   <!-- Autofocus zone -->
+  <string name="pref_camera_selectablezoneaf_title">Auto-focus zone</string>
+  <string name="pref_camera_selectablezoneaf_entry_auto">Auto</string>
+  <string name="pref_camera_selectablezoneaf_entry_centerweighted">Centre weighted</string>
+  <string name="pref_camera_selectablezoneaf_entry_frameaverage">Frame average</string>
+  <string name="pref_camera_selectablezoneaf_entry_spotmetering">Spot metering</string>
   <!-- Advanced features -->
+  <string name="pref_camera_advanced_features_title">Advanced features</string>
+  <string name="pref_camera_advanced_feature_entry_none">None</string>
+  <string name="pref_camera_advanced_feature_entry_multi_touch_focus">Multi-touch Focus</string>
   <!-- Manual exposure -->
+  <string name="pref_camera_manual_exp_title">Manual exposure</string>
+  <string name="pref_camera_manual_exp_entry_ISO_priority">ISO priority</string>
+  <string name="pref_camera_manual_exp_entry_exptime_priority">Exposure time priority</string>
+  <string name="pref_camera_manual_exp_entry_user_setting">User setting</string>
+  <string name="pref_camera_manual_exp_entry_off">Off</string>
   <!-- Manual white balance -->
+  <string name="pref_camera_manual_wb_title">Manual white balance</string>
+  <string name="pref_camera_manual_wb_entry_color_temperature">Colour temperature</string>
+  <string name="pref_camera_manual_wb_entry_rbgb_gains">RBGB gains</string>
+  <string name="pref_camera_manual_wb_entry_off">Off</string>
   <!-- Manual focus -->
+  <string name="pref_camera_manual_focus_title">Manual focus</string>
+  <string name="pref_camera_manual_focus_entry_scale_mode">Scale mode</string>
+  <string name="pref_camera_manual_focus_entry_diopter_mode">Diopter mode</string>
+  <string name="pref_camera_manual_focus_entry_off">Off</string>
   <!-- Still More -->
   <!-- Video HDR-->
+  <string name="pref_camera_video_hdr_title">Video HDR</string>
   <!-- CDS mode-->
+  <string name="pref_camera_cds_title">CDS mode</string>
+  <string name="pref_camera_cds_entry_auto">Auto</string>
   <!-- Video CDS-->
+  <string name="pref_camera_video_cds_title">Video CDS mode</string>
+  <string name="pref_camera_video_cds_entry_auto">Auto</string>
   <!-- TNR-->
+  <string name="pref_camera_tnr_title">TNR mode</string>
   <!-- Video TNR -->
+  <string name="pref_camera_video_tnr_title">Video TNR mode</string>
   <!-- Face detection -->
+  <string name="pref_camera_facedetection_title">Face detection</string>
   <!-- Selfie Flash -->
+  <string name="pref_selfie_flash_title">Selfie flash</string>
   <!-- Red eye reduction -->
+  <string name="pref_camera_redeyereduction_title">Red-eye reduction</string>
   <!-- AE bracketing -->
+  <string name="pref_camera_ae_bracket_hdr_title">AE bracketing</string>
   <!-- High-framerate recording -->
+  <string name="pref_camera_hfr_title">High-framerate recording</string>
+  <string name="pref_camera_hfr_entry_off">Off</string>
+  <string name="pref_camera_hfr_entry_2x">Slow motion 60 FPS</string>
+  <string name="pref_camera_hfr_entry_3x">Slow motion 90 FPS</string>
+  <string name="pref_camera_hfr_entry_4x">Slow motion 120 FPS</string>
+  <string name="pref_camera_hfr_entry_8x">Slow motion 240 FPS</string>
+  <string name="pref_camera_hfr_entry_hsr_60">High speed 60 FPS</string>
+  <string name="pref_camera_hfr_entry_hsr_90">High speed 90 FPS</string>
+  <string name="pref_camera_hfr_entry_hsr_120">High speed 120 FPS</string>
   <!-- See More -->
   <!-- Denoise -->
+  <string name="pref_camera_denoise_title">Denoise</string>
   <!-- ISO -->
+  <string name="pref_camera_iso_title">ISO</string>
+  <string name="pref_camera_iso_entry_auto">Auto</string>
+  <string name="pref_camera_iso_entry_isodeblur">Auto (HJR)</string>
+  <string name="pref_camera_iso_entry_iso50">ISO50</string>
+  <string name="pref_camera_iso_entry_iso100">ISO100</string>
+  <string name="pref_camera_iso_entry_iso125">ISO125</string>
+  <string name="pref_camera_iso_entry_iso150">ISO150</string>
+  <string name="pref_camera_iso_entry_iso200">ISO200</string>
+  <string name="pref_camera_iso_entry_iso250">ISO250</string>
+  <string name="pref_camera_iso_entry_iso300">ISO300</string>
+  <string name="pref_camera_iso_entry_iso320">ISO320</string>
+  <string name="pref_camera_iso_entry_iso350">ISO350</string>
+  <string name="pref_camera_iso_entry_iso400">ISO400</string>
+  <string name="pref_camera_iso_entry_iso450">ISO450</string>
+  <string name="pref_camera_iso_entry_iso500">ISO500</string>
+  <string name="pref_camera_iso_entry_iso600">ISO600</string>
+  <string name="pref_camera_iso_entry_iso640">ISO640</string>
+  <string name="pref_camera_iso_entry_iso700">ISO700</string>
+  <string name="pref_camera_iso_entry_iso800">ISO800</string>
+  <string name="pref_camera_iso_entry_iso1000">ISO1000</string>
+  <string name="pref_camera_iso_entry_iso1200">ISO1200</string>
+  <string name="pref_camera_iso_entry_iso1250">ISO1250</string>
+  <string name="pref_camera_iso_entry_iso1500">ISO1500</string>
+  <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
+  <string name="pref_camera_iso_entry_iso2000">ISO2000</string>
+  <string name="pref_camera_iso_entry_iso2500">ISO2500</string>
+  <string name="pref_camera_iso_entry_iso2700">ISO2700</string>
+  <string name="pref_camera_iso_entry_iso3200">ISO3200</string>
+  <string name="pref_camera_iso_entry_iso6400">ISO6400</string>
+  <string name="pref_camera_iso_entry_iso12800">ISO12800</string>
   <!-- Antibanding -->
+  <string name="pref_camera_antibanding_title">Anti-Banding</string>
+  <string name="pref_camera_antibanding_entry_0">Auto</string>
+  <string name="pref_camera_antibanding_entry_1">50 Hz (Europe)</string>
+  <string name="pref_camera_antibanding_entry_2">60 Hz (USA)</string>
   <!-- Color effect -->
+  <string name="pref_camera_coloreffect_title">Colour effect</string>
+  <string name="pref_camera_coloreffect_entry_none">None</string>
+  <string name="pref_camera_coloreffect_entry_mono">Mono</string>
+  <string name="pref_camera_coloreffect_entry_sepia">Sepia</string>
+  <string name="pref_camera_coloreffect_entry_negative">Negative</string>
   <!-- Color effect that overexposes and reverses some of the tones. -->
+  <string name="pref_camera_coloreffect_entry_solarize">Solarise</string>
+  <string name="pref_camera_coloreffect_entry_posterize">Posterise</string>
+  <string name="pref_camera_coloreffect_entry_aqua">Aqua</string>
+  <string name="pref_camera_coloreffect_entry_emboss">Emboss</string>
+  <string name="pref_camera_coloreffect_entry_sketch">Sketch</string>
+  <string name="pref_camera_coloreffect_entry_neon">Neon</string>
+  <string name="pref_camera_coloreffect_entry_pastel">Pastel</string>
+  <string name="pref_camera_coloreffect_entry_mosaic">Mosaic</string>
+  <string name="pref_camera_coloreffect_entry_redtint">Red tint</string>
+  <string name="pref_camera_coloreffect_entry_bluetint">Blue tint</string>
+  <string name="pref_camera_coloreffect_entry_greentint">Green tint</string>
   <!-- Stabilization -->
+  <string name="pref_camera_dis_title">Stabilisation</string>
   <!-- Face recognition -->
+  <string name="pref_camera_facerc_title">Face recognition</string>
   <!-- Sharpness -->
+  <string name="pref_camera_sharpness_title">Sharpness</string>
+  <string name="pref_camera_sharpness_entry_level0">Level 0</string>
+  <string name="pref_camera_sharpness_entry_level1">Level 1</string>
+  <string name="pref_camera_sharpness_entry_level2">Level 2 (default)</string>
+  <string name="pref_camera_sharpness_entry_level3">Level 3</string>
+  <string name="pref_camera_sharpness_entry_level4">Level 4</string>
+  <string name="pref_camera_sharpness_entry_level5">Level 5</string>
+  <string name="pref_camera_sharpness_entry_level6">Level 6</string>
   <!-- Contrast -->
+  <string name="pref_camera_contrast_title">Contrast</string>
+  <string name="pref_camera_contrast_entry_level0">Level 0</string>
+  <string name="pref_camera_contrast_entry_level1">Level 1</string>
+  <string name="pref_camera_contrast_entry_level2">Level 2</string>
+  <string name="pref_camera_contrast_entry_level3">Level 3</string>
+  <string name="pref_camera_contrast_entry_level4">Level 4</string>
+  <string name="pref_camera_contrast_entry_level5">Level 5 (default)</string>
+  <string name="pref_camera_contrast_entry_level6">Level 6</string>
+  <string name="pref_camera_contrast_entry_level7">Level 7</string>
+  <string name="pref_camera_contrast_entry_level8">Level 8</string>
+  <string name="pref_camera_contrast_entry_level9">Level 9</string>
+  <string name="pref_camera_contrast_entry_level10">Level 10</string>
   <!-- Saturation -->
+  <string name="pref_camera_saturation_title">Saturation</string>
+  <string name="pref_camera_saturation_entry_level0">Level 0</string>
+  <string name="pref_camera_saturation_entry_level1">Level 1</string>
+  <string name="pref_camera_saturation_entry_level2">Level 2</string>
+  <string name="pref_camera_saturation_entry_level3">Level 3</string>
+  <string name="pref_camera_saturation_entry_level4">Level 4</string>
+  <string name="pref_camera_saturation_entry_level5">Level 5 (default)</string>
+  <string name="pref_camera_saturation_entry_level6">Level 6</string>
+  <string name="pref_camera_saturation_entry_level7">Level 7</string>
+  <string name="pref_camera_saturation_entry_level8">Level 8</string>
+  <string name="pref_camera_saturation_entry_level9">Level 9</string>
+  <string name="pref_camera_saturation_entry_level10">Level 10</string>
   <!-- Picture format -->
+  <string name="pref_camera_picture_format_title">Picture format</string>
   <!-- Picture quality -->
+  <string name="pref_camera_jpegquality_title">Picture quality</string>
+  <string name="pref_camera_jpegquality_entry_0">55%</string>
+  <string name="pref_camera_jpegquality_entry_1">65% (Normal)</string>
+  <string name="pref_camera_jpegquality_entry_2">75% (Fine)</string>
+  <string name="pref_camera_jpegquality_entry_3">85% (Super Fine)</string>
+  <string name="pref_camera_jpegquality_entry_4">95%</string>
+  <string name="pref_camera_jpegquality_entry_5">100%</string>
   <!-- Histogram -->
+  <string name="pref_camera_histogram_title">Histogram</string>
   <!-- Auto scene detection -->
+  <string name="pref_camera_scenedetect_title">Auto scene detection</string>
   <!-- Continuous shot -->
+  <string name="pref_camera_longshot_title">Continuous shot</string>
   <!-- Auto HDR -->
+  <string name="pref_camera_auto_hdr_title">Auto HDR</string>
   <!-- HDR mode -->
+  <string name="pref_camera_hdr_mode_title">HDR mode</string>
+  <string name="pref_camera_hdr_mode_entry_sensor">Sensor HDR</string>
+  <string name="pref_camera_hdr_mode_entry_multi_frame">Multi-frame HDR</string>
   <!-- HDR needs 1x frame -->
+  <string name="pref_camera_hdr_need_1x_title">HDR needs 1x frame</string>
   <!-- Video rotation -->
+  <string name="pref_camera_video_rotation_title">Video rotation</string>
+  <string name="pref_camera_video_rotation_entry_0">0 degrees</string>
+  <string name="pref_camera_video_rotation_entry_90">90 degrees</string>
+  <string name="pref_camera_video_rotation_entry_180">180 degrees</string>
+  <string name="pref_camera_video_rotation_entry_270">270 degrees</string>
   <!-- Storage location -->
+  <string name="pref_camera_savepath_title">Storage location</string>
+  <string name="pref_camera_savepath_entry_0">Internal storage</string>
+  <string name="pref_camera_savepath_entry_1">SD card</string>
   <!-- Misc -->
   <!-- The alias of CameraActivity for gesture operation -->
+  <string name="camera_gesture_title">Launch camera</string>
+  <string name="all_in_focus">All in focus</string>
+  <string name="refocus_toast">To re-focus last photo, tap here</string>
   <!-- Toast messages -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for High-framerate recording mode -->
+  <string name="error_app_unsupported_hfr_selection">High-framerate recording is not supported when using Stabilisation/Time lapse/HDR.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for Slow motion mode -->
+  <string name="error_app_unsupported_hfr">Slow motion mode is not supported for the selected video size. Select a lower video size</string>
   <!-- The message is shown in toast when the app encounters an unsupported resolution for Stabilization mode -->
+  <string name="error_app_unsupported_dis">Stabilisation is not supported for the selected video size. Select a lower video size</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for High speed mode -->
+  <string name="error_app_unsupported_hsr">High speed mode is not supported for the selected video size. Select a lower video size</string>
   <!-- The message is shown in dialog when the app encounters an unsupported video codec for HFR mode -->
+  <string name="error_app_unsupported_hfr_codec">Only H264 video encoding is supported when HFR is ON</string>
   <!-- The message is shown in dialog when the app encounters an unsupported video resolution-->
+  <string name="error_app_unsupported">Unsupported video resolution for this encoder type</string>
   <!--The message is shown in dialog when the raw snapshot is selected in Zero shutter lag mode-->
+  <string name="error_app_unsupported_raw">Raw picture format is not supported in Zero shutter lag mode. Select JPEG</string>
+  <string name="msg_cancel_longshot_for_limited_memory">Running out of memory, cancelling continuous shot</string>
   <!-- Toast showing non-supported functionality for flash in AE bracket -->
+  <string name="flash_aebracket_message">Flash is not supported in AE bracketing mode</string>
   <!-- toast message for storage location switch -->
+  <string name="on_switch_save_path_to_sdcard">Internal storage space is not enough, switched storage location to SD card</string>
   <!-- The message is shown in toast when click showOnMap Menu and there is no map app -->
+  <string name="map_activity_not_found_err">There is no maps app installed to show the location</string>
   <!-- Continous shot enable message -->
+  <string name="longshot_enable_message">Advanced features are not supported in continuous shot mode</string>
   <!-- Advance features enable message -->
+  <string name="advance_feature_enable_msg">Continuous shot is not supported when advanced features are enabled</string>
   <!-- Toast after enable HDR function to inform continuous shot has disabled -->
+  <string name="HDR_disable_continuous_shot">Enabling HDR will disable continuous shot</string>
   <!-- Toast after enable advanced capture function to inform continuous shot has disabled -->
+  <string name="advanced_capture_disable_continuous_shot">Enabling advanced capture will disable continuous shot</string>
   <!-- Toast after enable 2k4k video quality to inform IS has disabled -->
+  <string name="video_quality_4k_disable_IS">Enabling 4k video size will disable Stabilisation</string>
   <!-- Toast after 2k4k video is enabled to inform SeeMore has been disabled -->
+  <string name="video_quality_4k_disable_SeeMore">SeeMore cannot be enabled during 4k video</string>
   <!-- Toast after SeeMore has been enabled to show CDS is disabled -->
+  <string name="disable_CDS_during_SeeMore">Enabling SeeMore will disable CDS</string>
   <!-- Toast after SeeMore has been enabled to show TNR is disabled -->
+  <string name="disable_TNR_during_SeeMore">Enabling SeeMore will disable TNR</string>
   <!-- TODO: Remove these? -->
 </resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index b9b98620d..cedb70b2e 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -16,84 +16,177 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- The name of the Android Camera application. [CHAR LIMIT=16] -->
+  <string name="app_name">Camera</string>
   <!-- The label for the Video Camera activity. [CHAR LIMIT=16] -->
+  <string name="video_camera_label">Camcorder</string>
   <!-- Used to format short video duration in Details dialog. minutes:seconds e.g. 00:30 -->
+  <string name="details_ms">%1$02d:%2$02d</string>
   <!-- Used to format video duration in Details dialog. hours:minutes:seconds e.g. 0:21:30 -->
+  <string name="details_hms">%1$d:%2$02d:%3$02d</string>
   <!-- Displayed in the title of the dialog for things to do with a picture
              that is to be "set as" (e.g. set as contact photo or set as wallpaper) -->
+  <string name="set_image">Set picture as</string>
   <!-- Details dialog "OK" button. Dismisses dialog. -->
+  <string name="delete">Delete</string>
   <!-- String Delete the selected media item(s) [CHAR LIMIT=50] -->
+  <plurals name="delete_selection">
+    <item quantity="one">Delete selected item?</item>
+    <item quantity="other">Delete selected items?</item>
+  </plurals>
+  <string name="share">Share</string>
+  <string name="share_panorama">Share panorama</string>
+  <string name="share_as_photo">Share as photo</string>
   <!-- The label shown after an image is deleted [CHAR LIMIT=16] -->
+  <string name="deleted">Deleted</string>
   <!-- The label on the button which when clicked will undo a deletion of image [CHAR LIMIT=16]-->
+  <string name="undo">UNDO</string>
+  <string name="details">Details</string>
+  <string name="close">Close</string>
   <!-- String indicating how many media item(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
+  <plurals name="number_of_items_selected">
+    <item quantity="one">%1$d selected</item>
+    <item quantity="other">%1$d selected</item>
+  </plurals>
   <!-- String indicating how many media album(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
+  <plurals name="number_of_albums_selected">
+    <item quantity="one">%1$d selected</item>
+    <item quantity="other">%1$d selected</item>
+  </plurals>
   <!-- String indicating how many media group(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
+  <plurals name="number_of_groups_selected">
+    <item quantity="one">%1$d selected</item>
+    <item quantity="other">%1$d selected</item>
+  </plurals>
   <!-- String indicating timestamp of photo or video -->
+  <string name="show_on_map">Show on map</string>
+  <string name="rotate_left">Rotate left</string>
+  <string name="rotate_right">Rotate right</string>
   <!-- String used as a menu label. The user can choose to edit the image
          [CHAR_LIMIT=20]-->
+  <string name="edit">Edit</string>
   <!-- The title of the menu item to let user crop the image. [CHAR LIMIT=15] -->
+  <string name="crop_action">Crop</string>
   <!-- The title of the menu item to let user trim the video. [CHAR LIMIT=15] -->
+  <string name="trim_action">Trim</string>
   <!-- The title of the menu item to let user set the image as background etc. [CHAR LIMIT=15] -->
+  <string name="set_as">Set as</string>
   <!-- String indicating an error when playing the video. [CHAR LIMIT=30] -->
+  <string name="video_err">Can\'t play video.</string>
   <!-- Toast message shown when the cropped image has been saved in the
          %s folder (string: folder_download) [CHAR LIMIT=50]-->
+  <string name="crop_saved">
+        Cropped image saved to <xliff:g id="folder_name">%s</xliff:g>.</string>
   <!-- Text indicating the title of a media item in details window [CHAR LIMIT=14] -->
+  <string name="title">Title</string>
   <!-- Text indicating the description of a media item in details window [CHAR LIMIT=14] -->
+  <string name="description">Description</string>
   <!-- Text indicating the creation time of a media item in details window [CHAR LIMIT=14] -->
+  <string name="time">Time</string>
   <!-- Text indicating the location of a media item in details window [CHAR LIMIT=14] -->
+  <string name="location">Location</string>
   <!-- Text indicating the path of a media item in details window [CHAR LIMIT=14] -->
+  <string name="path">Path</string>
   <!-- Text indicating the width of a media item in details window [CHAR LIMIT=14] -->
+  <string name="width">Width</string>
   <!-- Text indicating the height of a media item in details window [CHAR LIMIT=14] -->
+  <string name="height">Height</string>
   <!-- Text indicating the orientation of a media item in details window [CHAR LIMIT=14] -->
+  <string name="orientation">Orientation</string>
   <!-- Text indicating the duration of a video item in details window [CHAR LIMIT=18] -->
+  <string name="duration">Duration</string>
   <!-- Text indicating the mime type of a media item in details window [CHAR LIMIT=14] -->
+  <string name="mimetype">MIME type</string>
   <!-- Text indicating the file size of a media item in details window [CHAR LIMIT=14] -->
+  <string name="file_size">File size</string>
   <!-- Text indicating the maker of a media item in details window [CHAR LIMIT=14] -->
+  <string name="maker">Maker</string>
   <!-- Text indicating the model of a media item in details window [CHAR LIMIT=14] -->
+  <string name="model">Model</string>
   <!-- Text indicating flash info of a media item in details window [CHAR LIMIT=14] -->
+  <string name="flash">Flash</string>
   <!-- Text indicating aperture of a media item in details window [CHAR LIMIT=14] -->
+  <string name="aperture">Aperture</string>
   <!-- Text indicating the focal length of a media item in details window [CHAR LIMIT=14] -->
+  <string name="focal_length">Focal Length</string>
   <!-- Text indicating the white balance of a media item in details window [CHAR LIMIT=18] -->
+  <string name="white_balance">White balance</string>
   <!-- Text indicating the exposure time of a media item in details window [CHAR LIMIT=14] -->
+  <string name="exposure_time">Exposure time</string>
   <!-- Text indicating the ISO speed rating of a media item in details window [CHAR LIMIT=14] -->
+  <string name="iso">ISO</string>
   <!-- String indicating the time units in seconds. [CHAR LIMIT=8] -->
   <!-- String indicating the length units in milli-meters. [CHAR LIMIT=8] -->
+  <string name="unit_mm">mm</string>
   <!-- String indicating how camera shooting feature is used. [CHAR LIMIT=12] -->
+  <string name="manual">Manual</string>
   <!-- String indicating how camera shooting feature is used. [CHAR LIMIT=12 -->
+  <string name="auto">Auto</string>
   <!-- String indicating camera flash is fired. [CHAR LIMIT=14] -->
+  <string name="flash_on">Flash fired</string>
   <!-- String indicating camera flash is not used. [CHAR LIMIT=14] -->
+  <string name="flash_off">No flash</string>
   <!-- String indicating image width or height is unknown. [CHAR LIMIT=14] -->
+  <string name="unknown">Unknown</string>
   <!-- Toast message shown after we try to make a local album available offline
          [CHAR LIMIT=150] -->
+  <string name="try_to_set_local_album_available_offline">
+        This item is stored locally and available offline.</string>
   <!-- The content of a dialog showing trimming in progress. [CHAR LIMIT=30] -->
+  <string name="please_wait">Please wait</string>
   <!-- Text to show with progress bar while stitching a photo sphere. 'Photo sphere' is a product name. [CHAR LIMIT=35]-->
+  <string name="rendering_photo_sphere">Rendering photo sphere</string>
   <!-- title for the dialog showing the error of camera hardware -->
+  <string name="camera_error_title">Camera error</string>
   <!-- message for the dialog showing the error of camera hardware -->
+  <string name="cannot_connect_camera">Can\'t connect to the camera.</string>
   <!-- message for the dialog showing the camera is disabled because of security policies. Camera cannot be used. -->
+  <string name="camera_disabled">Camera has been disabled because of security policies.</string>
   <!-- message for the dialog showing that the app does not have sufficient permissions [CHAR LIMIT=NONE] -->
+  <string name="error_permissions">The app does not have critical permissions needed to run. Please check your permissions settings.</string>
   <!-- Dialog "Dismiss" button. Closes the dialog [CHAR LIMIT=12]-->
+  <string name="dialog_dismiss">Dismiss</string>
   <!-- alert to the user to wait for some operation to complete -->
+  <string name="wait">Please wait\u2026</string>
   <!-- alert to the user that an SD card must be installed before using the camera -->
+  <string name="no_storage" product="default">Insert an SD card before using the camera.</string>
   <!-- alert to the user that the SD card is being disk-checked -->
+  <string name="preparing_sd" product="default">Preparing SD card\u2026</string>
   <!-- alert to the user that the camera fails to read or write the SD card. -->
+  <string name="access_sd_fail" product="default">Couldn\'t access SD card.</string>
   <!-- A label that overlays on top of the preview frame to indicate the camcorder is in time lapse mode [CHAR LIMIT=35] -->
+  <string name="time_lapse_title">Time lapse recording</string>
   <!-- Screen display message during image capture to indicate that the capture is in progress, like during HDR+. [CHAR LIMIT=20] -->
+  <string name="capturing">Capturing</string>
   <!-- Settings screen, camera selection dialog title. Users can select a camera from the phone (front-facing or back-facing). [CHAR LIMIT=20] -->
+  <string name="pref_camera_id_title">Choose camera</string>
   <!-- In select camera setting, back facing camera. [CHAR LIMIT=14] -->
+  <string name="pref_camera_id_entry_back">Back</string>
   <!-- In select camera setting, front-facing camera. [CHAR LIMIT=14] -->
+  <string name="pref_camera_id_entry_front">Front</string>
   <!-- Settings screen, setting title text -->
+  <string name="pref_camera_recordlocation_title">Store location</string>
   <!--  Label for record location preference [CHAR LIMIT=50] -->
+  <string name="pref_camera_location_label">LOCATION</string>
   <!-- Title for countdown timer on camera settings screen [CHAR LIMIT=30]-->
+  <string name="pref_camera_timer_title">Countdown timer</string>
   <!-- Entry for countdown timer setting. e.g. 1 second, 10 seconds, etc. [CHAR LIMIT=30]-->
+  <plurals name="pref_camera_timer_entry">
+    <item quantity="one">1 second</item>
+    <item quantity="other">%d seconds</item>
+  </plurals>
   <!-- Text followed by a checkbox to turn on/off sound effects during the countdown. [CHAR LIMIT = 24]-->
+  <string name="pref_camera_timer_sound_title">Beep during countdown</string>
   <!-- Entry of a on/off setting. The setting is turned off. [CHAR LIMIT=15] -->
+  <string name="setting_off">Off</string>
   <!-- Entry of a on/off setting. The setting is turned on. [CHAR LIMIT=15] -->
+  <string name="setting_on">On</string>
   <!-- The value of a camera preference indicating the setting is off. -->
   <!-- The value of a camera preference indicating the setting is on. -->
   <!-- The Video quality settings in preference [CHAR LIMIT=21] -->
+  <string name="pref_video_quality_title">Video quality</string>
   <!-- The default quality value is NULL -->
   <!-- Video quality setting entry.
     Videos will be recorded in 4k DCI quality. [CHAR LIMIT=24] -->
@@ -104,170 +197,334 @@
   <!-- Video quality setting entry. Videos will be recorded in 480p quality. [CHAR LIMIT=24] -->
   <!-- Describes the preference dialog for choosing interval between frame capture for
     time lapse recording. Appears at top of the dialog. [CHAR LIMIT=30] -->
+  <string name="pref_video_time_lapse_frame_interval_title">Time lapse</string>
   <!-- Settings screen, Camera setting category title -->
+  <string name="pref_camera_settings_category">Camera settings</string>
   <!-- Settings screen, Camcorder setting category title -->
+  <string name="pref_camcorder_settings_category">Camcorder settings</string>
   <!-- Settings screen, Picture size title -->
+  <string name="pref_camera_picturesize_title">Picture size</string>
   <!-- Settings screen, Focus mode title -->
+  <string name="pref_camera_focusmode_title">Focus mode</string>
   <!-- Settings screen, Focus mode dialog radio button choices -->
+  <string name="pref_camera_focusmode_entry_auto">Auto</string>
   <!-- A setting that lets the camera focus into infinity. [CHAR LIMIT=20] -->
+  <string name="pref_camera_focusmode_entry_infinity">Infinity</string>
   <!-- A setting that lets the camera operate in macro focus mode for nearby objects. [CHAR LIMIT=20] -->
+  <string name="pref_camera_focusmode_entry_macro">Macro</string>
   <!-- Menu, focus mode labels [CHAR LIMIT=50] -->
+  <string name="pref_camera_focusmode_label_auto">AUTO</string>
+  <string name="pref_camera_focusmode_label_infinity">INFINITY</string>
+  <string name="pref_camera_focusmode_label_macro">MACRO</string>
   <!-- Default flash mode setting.-->
   <!-- Value for flash off setting-->
   <!-- Settings screen, Flash mode title -->
+  <string name="pref_camera_flashmode_title">Flash mode</string>
   <!-- flash label [CHAR LIMIT=50] -->
+  <string name="pref_camera_flashmode_label">FLASH MODE</string>
   <!-- Settings screen, Flash mode 'auto'. [CHAR LIMIT=12] -->
+  <string name="pref_camera_flashmode_entry_auto">Auto</string>
   <!-- Settings screen, Flash mode 'alway on'. [CHAR LIMIT=12] -->
+  <string name="pref_camera_flashmode_entry_on">On</string>
   <!-- Settings screen, Flash mode 'always off'. [CHAR LIMIT=12] -->
+  <string name="pref_camera_flashmode_entry_off">Off</string>
   <!-- Menu, flash mode labels [CHAR LIMIT=50] -->
+  <string name="pref_camera_flashmode_label_auto">FLASH AUTO</string>
+  <string name="pref_camera_flashmode_label_on">FLASH ON</string>
+  <string name="pref_camera_flashmode_label_off">FLASH OFF</string>
   <!-- Default videocamera flash mode setting.-->
   <!-- Default white balance setting. -->
   <!-- Settings screen, white balance title -->
+  <string name="pref_camera_whitebalance_title">White balance</string>
   <!-- Menu, white balance label -->
+  <string name="pref_camera_whitebalance_label">WHITE BALANCE</string>
   <!-- Settings screen, White balance dialog radio button choices -->
+  <string name="pref_camera_whitebalance_entry_auto">Auto</string>
+  <string name="pref_camera_whitebalance_entry_incandescent">Incandescent</string>
+  <string name="pref_camera_whitebalance_entry_daylight">Daylight</string>
+  <string name="pref_camera_whitebalance_entry_fluorescent">Fluorescent</string>
+  <string name="pref_camera_whitebalance_entry_cloudy">Cloudy</string>
   <!-- Menu, White balance labels [CHAR LIMIT=50] -->
+  <string name="pref_camera_whitebalance_label_auto">AUTO</string>
+  <string name="pref_camera_whitebalance_label_incandescent">INCANDESCENT</string>
+  <string name="pref_camera_whitebalance_label_daylight">DAYLIGHT</string>
+  <string name="pref_camera_whitebalance_label_fluorescent">FLUORESCENT</string>
+  <string name="pref_camera_whitebalance_label_cloudy">CLOUDY</string>
   <!-- Default scene mode setting. -->
   <!-- Settings screen, Select Scene mode -->
+  <string name="pref_camera_scenemode_title">Scene mode</string>
   <!-- Settings menu, scene mode choices [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_auto">Auto</string>
   <!-- Scene mode that uses HDR plus (better HDR) [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_hdr_plus">HDR+</string>
   <!-- Scene mode that uses HDR (high dynamic range) [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_hdr">HDR</string>
   <!-- Scene mode to turn on HDR (better high dynamic range) [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_entry_turn_hdr_plus_on">HDR+ ON</string>
   <!-- Scene mode to turn off HDR (better high dynamic range) [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_entry_turn_hdr_plus_off">HDR+ OFF</string>
   <!-- Scene mode to turn on HDR (high dynamic range) [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_entry_turn_hdr_on">HDR ON</string>
   <!-- Scene mode to turn off HDR (high dynamic range) [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_entry_turn_hdr_off">HDR OFF</string>
   <!-- Scene mode that takes an image quickly with little motion blur. [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_action">Action</string>
   <!-- Scene mode that takes long exposures to capture night scenes without flash. [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_night">Night</string>
   <!-- Scene mode optimized for taking images in the sunset. [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_sunset">Sunset</string>
   <!-- Scene mode optimized for taking indoor low-lights pictures. [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_party">Party</string>
   <!-- Settings menu, scene mode labels [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_label_auto">NONE</string>
   <!-- Scene mode that takes an image quickly with little motion blur. [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_label_action">ACTION</string>
   <!-- Scene mode that takes long exposures to capture night scenes without flash. [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_label_night">NIGHT</string>
   <!-- Scene mode optimized for taking images in the sunset. [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_label_sunset">SUNSET</string>
   <!-- Scene mode optimized for taking indoor low-lights pictures. [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_label_party">PARTY</string>
   <!-- Settings menu countdown timer off [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_off">TIMER OFF</string>
   <!-- Settings menu countdown timer 1 second [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_one">1 SECOND</string>
   <!-- Settings menu countdown timer 3 seconds [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_three">3 SECONDS</string>
   <!-- Settings menu countdown timer 10 seconds [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_ten">10 SECONDS</string>
   <!-- Settings menu countdown timer 15 seconds [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_fifteen">15 SECONDS</string>
   <!-- Toast after trying to select a setting that is not allowed to change in scene mode [CHAR LIMIT=NONE] -->
+  <string name="not_selectable_in_scene_mode">Not selectable in scene mode.</string>
   <!-- Exposure settings in preference -->
+  <string name="pref_exposure_title">Exposure</string>
   <!--  menu label exposure compensation [CHAR LIMIT=50] -->
+  <string name="pref_exposure_label">EXPOSURE</string>
   <!-- Default HDR entry value -->
   <!-- Default HDR+ entry value -->
   <!-- HDR label ON [CHAR LIMIT=60] -->
+  <string name="pref_camera_hdr_label">HDR</string>
   <!-- switch camera label back [CHAR LIMIT=60] -->
+  <string name="pref_camera_id_label_back">FRONT CAMERA</string>
   <!-- switch camera label front [CHAR LIMIT=60] -->
+  <string name="pref_camera_id_label_front">BACK CAMERA</string>
   <!-- Dialog "OK" button. Dismisses dialog. -->
+  <string name="dialog_ok">OK</string>
   <!-- Low-memory dialog message [CHAR LIMIT=NONE] -->
+  <string name="spaceIsLow_content" product="default">Your SD card is running out of space. Change the quality setting or delete some images or other files.</string>
   <!-- Camera format string for new image files. Passed to java.text.SimpleDateFormat. -->
   <!-- Video Camera format string for new video files. Passed to java.text.SimpleDateFormat. -->
   <!-- Filename prefix for panorama output. -->
   <!-- The message shown when video record reaches size limit. -->
+  <string name="video_reach_size_limit">Size limit reached.</string>
   <!-- The text shown when the panorama panning speed is to fast [CHAR LIMIT=16] -->
+  <string name="pano_too_fast_prompt">Too fast</string>
   <!-- The text shown in the progress dialog when panorama preview is generating in the background [CHAR LIMIT=30] -->
+  <string name="pano_dialog_prepare_preview">Preparing panorama</string>
   <!-- The text shown in the dialog when panorama saving failed [CHAR LIMIT=40] -->
+  <string name="pano_dialog_panorama_failed">Couldn\'t save panorama.</string>
   <!-- The text shown on the dialog title in the dialogs for Panorama [CHAR LIMIT=12] -->
+  <string name="pano_dialog_title">Panorama</string>
   <!-- The text shown on the top-left corner of the screen to indicate the capturing is on going [CHAR LIMIT=27] -->
+  <string name="pano_capture_indication">Capturing panorama</string>
   <!-- The text shown in the progress dialog when waiting for previous panorama finishing [CHAR LIMIT=40] -->
+  <string name="pano_dialog_waiting_previous">Waiting for previous panorama</string>
   <!-- The text shown on the bottom-left corner of the screen to indicate that the saving is in process [CHAR LIMIT=13] -->
+  <string name="pano_review_saving_indication_str">Saving\u2026</string>
   <!-- The text shown on the screen to indicate that the panorama is rendering [CHAR LIMIT=27] -->
+  <string name="pano_review_rendering">Rendering panorama</string>
   <!-- Toast telling users tapping on the viewfinder will trigger autofocus [CHAR LIMIT=28] -->
+  <string name="tap_to_focus">Touch to focus.</string>
   <!-- Default effect setting that clears the effect. -->
   <!-- Title of video effect setting popup window -->
+  <string name="pref_video_effect_title">Effects</string>
   <!-- Effect setting item that clear the effect. [CHAR LIMIT=14] -->
+  <string name="effect_none">None</string>
   <!-- Effect setting item that squeezes the face. [CHAR LIMIT=14] -->
+  <string name="effect_goofy_face_squeeze">Squeeze</string>
   <!-- Effect setting item that makes eyes big. [CHAR LIMIT=14] -->
+  <string name="effect_goofy_face_big_eyes">Big eyes</string>
   <!-- Effect setting item that makes mouth big. [CHAR LIMIT=14] -->
+  <string name="effect_goofy_face_big_mouth">Big mouth</string>
   <!-- Effect setting item that makes mouth small. [CHAR LIMIT=14] -->
+  <string name="effect_goofy_face_small_mouth">Small mouth</string>
   <!-- Effect setting item that makes nose big. [CHAR LIMIT=14] -->
+  <string name="effect_goofy_face_big_nose">Big nose</string>
   <!-- Effect setting item that makes eyes small. [CHAR LIMIT=14] -->
+  <string name="effect_goofy_face_small_eyes">Small eyes</string>
   <!-- Effect setting item that replaces background with Android in Space. [CHAR LIMIT=14] -->
+  <string name="effect_backdropper_space">In space</string>
   <!-- Effect setting item that replaces background with a sunset. [CHAR LIMIT=14] -->
+  <string name="effect_backdropper_sunset">Sunset</string>
   <!-- Effect setting item that replaces background with video from gallery. [CHAR LIMIT=14] -->
+  <string name="effect_backdropper_gallery">Your video</string>
   <!-- Toast telling users tapping on the viewfinder will take a picture [CHAR LIMIT=54] -->
+  <string name="video_snapshot_hint">Touch to take photo while recording.</string>
   <!-- Announcement telling users video recording has just started [CHAR LIMIT=NONE] -->
+  <string name="video_recording_started">Video recording has started.</string>
   <!-- Announcement telling users video recording has just stopped [CHAR LIMIT=NONE] -->
+  <string name="video_recording_stopped">Video recording has stopped.</string>
   <!-- A button in effect setting popup to clear the effect. [CHAR LIMIT=26] -->
+  <string name="clear_effects">Clear effects</string>
   <!-- Title of category for silly face effects. [CHAR LIMIT=26] -->
+  <string name="effect_silly_faces">SILLY FACES</string>
   <!-- Title of category for background replacement effects. [CHAR LIMIT=26] -->
+  <string name="effect_background">BACKGROUND</string>
   <!-- The shutter button. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_shutter_button">Shutter</string>
   <!-- The menu button. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_menu_button">Menu button</string>
   <!-- The mode picker to switch between camera, video and panorama. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_mode_picker">Camera, video, or panorama selector</string>
   <!-- The check box in camera settings, such as store location. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_check_box">%1$s check box</string>
   <!-- The button to switch to Camera mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_camera">Switch to photo</string>
   <!-- The button to switch to Video mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_video">Switch to video</string>
   <!-- The button to switch to Panorama mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_panorama">Switch to panorama</string>
   <!-- The button to switch to the Photo Sphere mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_photo_sphere">Switch to Photo Sphere</string>
   <!-- The button to switch to the high quality mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_gcam">Switch to high quality</string>
   <!-- The button in review mode indicating that the photo taking, video recording, and panorama saving session should be canceled [CHAR LIMIT = NONE] -->
+  <string name="accessibility_review_cancel">Review cancel</string>
   <!-- The button in review mode indicating that the taken photo/video is OK to be attached/uploaded [CHAR LIMIT = NONE] -->
+  <string name="accessibility_review_ok">Review done</string>
   <!-- button in review mode indicate the user want to retake another photo/video for attachment [
 CHAR LIMIT = NONE] -->
+  <string name="accessibility_review_retake">Review retake</string>
   <!-- Default text for a button that can be toggled on and off. -->
+  <string name="capital_on">ON</string>
   <!-- Default text for a button that can be toggled on and off. -->
+  <string name="capital_off">OFF</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_off">Off</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_500">0.5 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_1000">1 second</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_1500">1.5 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_2000">2 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_2500">2.5 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_3000">3 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_4000">4 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_5000">5 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_6000">6 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_10000">10 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_12000">12 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_15000">15 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_24000">24 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_30000">0.5 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_60000">1 minute</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_90000">1.5 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_120000">2 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_150000">2.5 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_180000">3 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_240000">4 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_300000">5 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_360000">6 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_600000">10 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_720000">12 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_900000">15 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_1440000">24 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_1800000">0.5 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_3600000">1 hour</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_5400000">1.5 hour</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_7200000">2 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_9000000">2.5 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_10800000">3 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_14400000">4 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_18000000">5 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_21600000">6 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_36000000">10 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_43200000">12 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_54000000">15 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_86400000">24 hours</string>
   <!-- Seconds: a unit of time for time lapse intervals. [CHAR LIMIT = 20] -->
+  <string name="time_lapse_seconds">seconds</string>
   <!-- Minutes: a unit of time for time lapse intervals. [CHAR LIMIT = 20] -->
+  <string name="time_lapse_minutes">minutes</string>
   <!-- Hours: a unit of time for time lapse intervals. [CHAR LIMIT = 20] -->
+  <string name="time_lapse_hours">hours</string>
   <!-- The button to confirm time-lapse setting changes. [CHAR LIMIT = 20] -->
+  <string name="time_lapse_interval_set">Done</string>
   <!-- Title in time interval picker for setting time interval. [CHAR LIMIT = 30]-->
+  <string name="set_time_interval">Set Time Interval</string>
   <!-- Help text that is shown when the time lapse feature is turned off. [CHAR LIMIT = 180]-->
+  <string name="set_time_interval_help">Time lapse feature is off. Turn it on to set time interval.</string>
   <!-- Title in timer setting for setting the duration for the countdown timer. [CHAR LIMIT = 50]-->
+  <string name="set_duration">Set duration in seconds</string>
   <!-- On-screen hint during timer countdown for taking a photo. [CHAR LIMIT = 60]-->
+  <string name="count_down_title_text">Counting down to take a photo</string>
   <!-- Title for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 50] -->
+  <string name="remember_location_title">Remember photo locations?</string>
   <!-- Message for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = None] -->
+  <string name="remember_location_prompt">Tag your photos and videos with the locations where they are taken.\n\nOther apps can access this information along with your saved images.</string>
   <!-- Negative answer for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 20] -->
+  <string name="remember_location_no">No, thanks</string>
   <!-- Positive answer for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 20] -->
+  <string name="remember_location_yes">Yes</string>
   <!-- Camera menu labels -->
   <!-- more options label [CHAR LIMIT=50] -->
+  <string name="camera_menu_more_label">MORE OPTIONS</string>
   <!-- settings label [CHAR LIMIT=50] -->
+  <string name="camera_menu_settings_label">SETTINGS</string>
   <!--  Tiny Planet -->
   <!-- Button to press for creating a tiny planet image. [CHAR LIMIT = 30] -->
+  <string name="create_tiny_planet">Create Tiny Planet</string>
   <!-- Message shown while a tiny planet image is being saved. [CHAR LIMIT = 30] -->
+  <string name="saving_tiny_planet">Saving Tiny Planet &#8230;</string>
   <!-- Label above a slider that let's the user set the zoom of a tiny planet image. [CHAR LIMIT = 15] -->
+  <string name="tiny_planet_zoom">Zoom</string>
   <!-- Label above a slider that let's the user set the rotation of a tiny planet image. [CHAR LIMIT = 15] -->
+  <string name="tiny_planet_rotate">Rotate</string>
   <!-- Crop -->
   <!-- Label for the save button in the crop activity action bar [CHAR LIMIT=20] -->
+  <string name="crop_save">Save</string>
   <!--  String shown when we cannot load the image when starting the activity [CHAR LIMIT=NONE] -->
+  <string name="cannot_load_image">Cannot load the image!</string>
   <!-- Label for album filmstrip button -->
+  <string name="switch_photo_filmstrip">Filmstrip view</string>
   <!--  String shown when setting the homepage wallpaper in the background [CHAR LIMIT=NONE] -->
+  <string name="setting_wallpaper">Setting wallpaper</string>
 </resources>
diff --git a/res/values-en-rGB/cm_strings.xml b/res/values-en-rGB/cm_strings.xml
index 92cc92c93..93b3bf66e 100644
--- a/res/values-en-rGB/cm_strings.xml
+++ b/res/values-en-rGB/cm_strings.xml
@@ -18,17 +18,92 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- common aspect ratios -->
   <!-- aspect ratio greater than 16:9, so "widescreen" or "cinematic" -->
+  <string name="pref_camera_aspectratio_wide">Wide</string>
   <!-- Format for entries in the picture size menu. Parameter one is aspect ratio,
          parameter two is size in megapixels, e.g. "(4:3) 12.1 megapixels"
          NOTE: for Chinese (zh) and Korean (ko) the pixel number (parameter two)
          will be multiplied by 100 as those languages want to count by ten thousands -->
+  <string name="pref_camera_megapixel_format">(<xliff:g id="ratio" example="16:9">%1$s</xliff:g>) <xliff:g id="pixels">%2$1.1f</xliff:g> megapixels</string>
   <!-- Settings screen, scene mode -->
+  <string name="pref_camera_scenemode_entry_refocus">Macro+</string>
+  <string name="pref_camera_scenemode_entry_antimotionblur">Motion blur reduction</string>
+  <string name="pref_camera_scenemode_entry_aqua">Aqua</string>
+  <string name="pref_camera_scenemode_entry_ar">Augmented reality</string>
+  <string name="pref_camera_scenemode_entry_asd">Best shot</string>
+  <string name="pref_camera_scenemode_entry_baby">Baby</string>
+  <string name="pref_camera_scenemode_entry_backgroundblur">Background blur</string>
+  <string name="pref_camera_scenemode_entry_backlight">Backlight</string>
+  <string name="pref_camera_scenemode_entry_backlightportrait">Backlight portrait</string>
+  <string name="pref_camera_scenemode_entry_barcode">Barcode</string>
+  <string name="pref_camera_scenemode_entry_beach">Beach</string>
+  <string name="pref_camera_scenemode_entry_beauty">Beauty</string>
+  <string name="pref_camera_scenemode_entry_candlelight">Candlelight</string>
+  <string name="pref_camera_scenemode_entry_cine">Cine</string>
+  <string name="pref_camera_scenemode_entry_closeup">Closeup</string>
+  <string name="pref_camera_scenemode_entry_dark">Dark</string>
+  <string name="pref_camera_scenemode_entry_dish">Dish</string>
+  <string name="pref_camera_scenemode_entry_duskdawn">Duskdawn</string>
+  <string name="pref_camera_scenemode_entry_document">Document</string>
+  <string name="pref_camera_scenemode_entry_fallcolor">Autumn</string>
+  <string name="pref_camera_scenemode_entry_fireworks">Fireworks</string>
+  <string name="pref_camera_scenemode_entry_flowers">Flowers</string>
+  <string name="pref_camera_scenemode_entry_handheldtwilight">Handheld twilight</string>
+  <string name="pref_camera_scenemode_entry_highsensitivity">High sensitivity</string>
+  <string name="pref_camera_scenemode_entry_indoor">Indoor</string>
+  <string name="pref_camera_scenemode_entry_landscape">Landscape</string>
+  <string name="pref_camera_scenemode_entry_mix_illuminant">Mixed lighting</string>
+  <string name="pref_camera_scenemode_entry_mood">Mood</string>
+  <string name="pref_camera_scenemode_entry_nightportrait">Night portrait</string>
+  <string name="pref_camera_scenemode_entry_nightindoor">Night indoor</string>
+  <string name="pref_camera_scenemode_entry_oldfilm">Old film</string>
+  <string name="pref_camera_scenemode_entry_pet">Pet</string>
+  <string name="pref_camera_scenemode_entry_portrait">Portrait</string>
+  <string name="pref_camera_scenemode_entry_snow">Snow</string>
+  <string name="pref_camera_scenemode_entry_softskin">Soft skin</string>
+  <string name="pref_camera_scenemode_entry_sports">Sports</string>
+  <string name="pref_camera_scenemode_entry_spotlight">Spotlight</string>
+  <string name="pref_camera_scenemode_entry_steadyphoto">Steady photo</string>
+  <string name="pref_camera_scenemode_entry_supernight">Dark night</string>
+  <string name="pref_camera_scenemode_entry_sweepstitch">Sweep stitch</string>
+  <string name="pref_camera_scenemode_entry_text">Text</string>
+  <string name="pref_camera_scenemode_entry_theatre">Theatre</string>
+  <string name="pref_camera_scenemode_entry_whiteboard">Whiteboard</string>
   <!-- Settings screen, focus mode -->
+  <string name="pref_camera_focusmode_entry_continuous">Continuous</string>
+  <string name="pref_camera_focusmode_entry_mw_continuous">Continuous (MW)</string>
+  <string name="pref_camera_focusmode_entry_extended">Extended</string>
+  <string name="pref_camera_focusmode_entry_facedetect">Face detect</string>
+  <string name="pref_camera_focusmode_entry_facepriority">Face priority</string>
+  <string name="pref_camera_focusmode_entry_fixed">Fixed</string>
+  <string name="pref_camera_focusmode_entry_normal">Normal</string>
+  <string name="pref_camera_focusmode_entry_portrait">Portrait</string>
+  <string name="pref_camera_focusmode_entry_hyperfocal">Hyperfocal</string>
   <!-- Color effects -->
+  <string name="pref_camera_coloreffect_entry_washed">Washed</string>
+  <string name="pref_camera_coloreffect_entry_vintage_warm">Vintage warm</string>
+  <string name="pref_camera_coloreffect_entry_vintage_cold">Vintage cold</string>
+  <string name="pref_camera_coloreffect_entry_point_blue">Point blue</string>
+  <string name="pref_camera_coloreffect_entry_point_green">Point green</string>
+  <string name="pref_camera_coloreffect_entry_point_red_yellow">Point red-yellow</string>
+  <string name="pref_camera_coloreffect_entry_cartoonize">Cartoonise</string>
   <!-- Red eye flash mode title -->
+  <string name="pref_camera_flashmode_entry_redeye">Red eye</string>
+  <string name="pref_camera_flashmode_label_redeye">RED EYE</string>
   <!-- Power shutter -->
+  <string name="pref_camera_power_shutter_title">Power shutter</string>
   <!-- Max brightness -->
+  <string name="pref_camera_max_brightness_title">Bright screen</string>
   <!-- Touch focus duration -->
+  <string name="pref_camera_focustime_title">Touch focus duration</string>
+  <string name="pref_camera_focustime_entry_0">0s</string>
+  <string name="pref_camera_focustime_entry_3">3s</string>
+  <string name="pref_camera_focustime_entry_5">5s</string>
+  <string name="pref_camera_focustime_entry_10">10s</string>
+  <string name="pref_camera_focustime_entry_infinite">Infinite</string>
   <!-- Shutter speed -->
+  <string name="pref_camera_shutter_speed_title">Shutter speed</string>
+  <string name="auto_hdr_enabled">Auto HDR enabled</string>
   <!-- Advanced options -->
+  <string name="developer_menu_enabled">You have enabled advanced camera options</string>
+  <string name="developer_menu_disabled">You have disabled advanced camera options</string>
 </resources>
diff --git a/res/values-en-rGB/qcomstrings.xml b/res/values-en-rGB/qcomstrings.xml
index 63b1dec74..759bc4ea0 100644
--- a/res/values-en-rGB/qcomstrings.xml
+++ b/res/values-en-rGB/qcomstrings.xml
@@ -27,67 +27,247 @@
   <!-- 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] -->
   <!-- Auto exposure -->
+  <string name="pref_camera_autoexposure_title">Auto exposure</string>
+  <string name="pref_camera_autoexposure_entry_centerweighted">Centre weighted</string>
+  <string name="pref_camera_autoexposure_entry_frameaverage">Frame average</string>
+  <string name="pref_camera_autoexposure_entry_spotmetering">Spot metering</string>
   <!-- Video codec -->
+  <string name="pref_camera_videoencoder_title">Video codec</string>
   <!-- Audio codec -->
+  <string name="pref_camera_audioencoder_title">Audio codec</string>
   <!-- Skin tone enhancement -->
+  <string name="pref_camera_skinToneEnhancement_title">Skin tone enhancement</string>
   <!-- Zero shutter lag-->
+  <string name="pref_camera_zsl_title">Zero shutter lag</string>
   <!-- Autofocus zone -->
+  <string name="pref_camera_selectablezoneaf_title">Autofocus zone</string>
+  <string name="pref_camera_selectablezoneaf_entry_auto">Auto</string>
+  <string name="pref_camera_selectablezoneaf_entry_centerweighted">Centre weighted</string>
+  <string name="pref_camera_selectablezoneaf_entry_frameaverage">Frame average</string>
+  <string name="pref_camera_selectablezoneaf_entry_spotmetering">Spot metering</string>
   <!-- Advanced features -->
+  <string name="pref_camera_advanced_features_title">Advanced features</string>
+  <string name="pref_camera_advanced_feature_entry_none">None</string>
+  <string name="pref_camera_advanced_feature_entry_multi_touch_focus">Multi-touch Focus</string>
   <!-- Manual exposure -->
+  <string name="pref_camera_manual_exp_title">Manual exposure</string>
+  <string name="pref_camera_manual_exp_entry_ISO_priority">ISO priority</string>
+  <string name="pref_camera_manual_exp_entry_exptime_priority">Exposure time priority</string>
+  <string name="pref_camera_manual_exp_entry_user_setting">User setting</string>
+  <string name="pref_camera_manual_exp_entry_off">Off</string>
   <!-- Manual white balance -->
+  <string name="pref_camera_manual_wb_title">Manual white balance</string>
+  <string name="pref_camera_manual_wb_entry_color_temperature">Colour temperature</string>
+  <string name="pref_camera_manual_wb_entry_rbgb_gains">RBGB gains</string>
+  <string name="pref_camera_manual_wb_entry_off">Off</string>
   <!-- Manual focus -->
+  <string name="pref_camera_manual_focus_title">Manual focus</string>
+  <string name="pref_camera_manual_focus_entry_scale_mode">Scale mode</string>
+  <string name="pref_camera_manual_focus_entry_diopter_mode">Diopter mode</string>
+  <string name="pref_camera_manual_focus_entry_off">Off</string>
   <!-- Still More -->
   <!-- Video HDR-->
+  <string name="pref_camera_video_hdr_title">Video HDR</string>
   <!-- CDS mode-->
+  <string name="pref_camera_cds_title">CDS mode</string>
+  <string name="pref_camera_cds_entry_auto">Auto</string>
   <!-- Video CDS-->
+  <string name="pref_camera_video_cds_title">Video CDS mode</string>
+  <string name="pref_camera_video_cds_entry_auto">Auto</string>
   <!-- TNR-->
+  <string name="pref_camera_tnr_title">TNR mode</string>
   <!-- Video TNR -->
+  <string name="pref_camera_video_tnr_title">Video TNR mode</string>
   <!-- Face detection -->
+  <string name="pref_camera_facedetection_title">Face detection</string>
   <!-- Selfie Flash -->
+  <string name="pref_selfie_flash_title">Selfie flash</string>
   <!-- Red eye reduction -->
+  <string name="pref_camera_redeyereduction_title">Red eye reduction</string>
   <!-- AE bracketing -->
+  <string name="pref_camera_ae_bracket_hdr_title">AE bracketing</string>
   <!-- High-framerate recording -->
+  <string name="pref_camera_hfr_title">High-framerate recording</string>
+  <string name="pref_camera_hfr_entry_off">Off</string>
+  <string name="pref_camera_hfr_entry_2x">Slow motion 60 FPS</string>
+  <string name="pref_camera_hfr_entry_3x">Slow motion 90 FPS</string>
+  <string name="pref_camera_hfr_entry_4x">Slow motion 120 FPS</string>
+  <string name="pref_camera_hfr_entry_8x">Slow motion 240 FPS</string>
+  <string name="pref_camera_hfr_entry_hsr_60">High speed 60 FPS</string>
+  <string name="pref_camera_hfr_entry_hsr_90">High speed 90 FPS</string>
+  <string name="pref_camera_hfr_entry_hsr_120">High speed 120 FPS</string>
   <!-- See More -->
   <!-- Denoise -->
+  <string name="pref_camera_denoise_title">Denoise</string>
   <!-- ISO -->
+  <string name="pref_camera_iso_title">ISO</string>
+  <string name="pref_camera_iso_entry_auto">Auto</string>
+  <string name="pref_camera_iso_entry_isodeblur">Auto (HJR)</string>
+  <string name="pref_camera_iso_entry_iso50">ISO50</string>
+  <string name="pref_camera_iso_entry_iso100">ISO100</string>
+  <string name="pref_camera_iso_entry_iso125">ISO125</string>
+  <string name="pref_camera_iso_entry_iso150">ISO150</string>
+  <string name="pref_camera_iso_entry_iso200">ISO200</string>
+  <string name="pref_camera_iso_entry_iso250">ISO250</string>
+  <string name="pref_camera_iso_entry_iso300">ISO300</string>
+  <string name="pref_camera_iso_entry_iso320">ISO320</string>
+  <string name="pref_camera_iso_entry_iso350">ISO350</string>
+  <string name="pref_camera_iso_entry_iso400">ISO400</string>
+  <string name="pref_camera_iso_entry_iso450">ISO450</string>
+  <string name="pref_camera_iso_entry_iso500">ISO500</string>
+  <string name="pref_camera_iso_entry_iso600">ISO600</string>
+  <string name="pref_camera_iso_entry_iso640">ISO640</string>
+  <string name="pref_camera_iso_entry_iso700">ISO700</string>
+  <string name="pref_camera_iso_entry_iso800">ISO800</string>
+  <string name="pref_camera_iso_entry_iso1000">ISO1000</string>
+  <string name="pref_camera_iso_entry_iso1200">ISO1200</string>
+  <string name="pref_camera_iso_entry_iso1250">ISO1250</string>
+  <string name="pref_camera_iso_entry_iso1500">ISO1500</string>
+  <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
+  <string name="pref_camera_iso_entry_iso2000">ISO2000</string>
+  <string name="pref_camera_iso_entry_iso2500">ISO2500</string>
+  <string name="pref_camera_iso_entry_iso2700">ISO2700</string>
+  <string name="pref_camera_iso_entry_iso3200">ISO3200</string>
+  <string name="pref_camera_iso_entry_iso6400">ISO6400</string>
+  <string name="pref_camera_iso_entry_iso12800">ISO12800</string>
   <!-- Antibanding -->
+  <string name="pref_camera_antibanding_title">Antibanding</string>
+  <string name="pref_camera_antibanding_entry_0">Auto</string>
+  <string name="pref_camera_antibanding_entry_1">50 Hz (Europe)</string>
+  <string name="pref_camera_antibanding_entry_2">60 Hz (USA)</string>
   <!-- Color effect -->
+  <string name="pref_camera_coloreffect_title">Colour effect</string>
+  <string name="pref_camera_coloreffect_entry_none">None</string>
+  <string name="pref_camera_coloreffect_entry_mono">Mono</string>
+  <string name="pref_camera_coloreffect_entry_sepia">Sepia</string>
+  <string name="pref_camera_coloreffect_entry_negative">Negative</string>
   <!-- Color effect that overexposes and reverses some of the tones. -->
+  <string name="pref_camera_coloreffect_entry_solarize">Solarise</string>
+  <string name="pref_camera_coloreffect_entry_posterize">Posterise</string>
+  <string name="pref_camera_coloreffect_entry_aqua">Aqua</string>
+  <string name="pref_camera_coloreffect_entry_emboss">Emboss</string>
+  <string name="pref_camera_coloreffect_entry_sketch">Sketch</string>
+  <string name="pref_camera_coloreffect_entry_neon">Neon</string>
+  <string name="pref_camera_coloreffect_entry_pastel">Pastel</string>
+  <string name="pref_camera_coloreffect_entry_mosaic">Mosaic</string>
+  <string name="pref_camera_coloreffect_entry_redtint">Red tint</string>
+  <string name="pref_camera_coloreffect_entry_bluetint">Blue tint</string>
+  <string name="pref_camera_coloreffect_entry_greentint">Green tint</string>
   <!-- Stabilization -->
+  <string name="pref_camera_dis_title">Stabilisation</string>
   <!-- Face recognition -->
+  <string name="pref_camera_facerc_title">Face recognition</string>
   <!-- Sharpness -->
+  <string name="pref_camera_sharpness_title">Sharpness</string>
+  <string name="pref_camera_sharpness_entry_level0">Level 0</string>
+  <string name="pref_camera_sharpness_entry_level1">Level 1</string>
+  <string name="pref_camera_sharpness_entry_level2">Level 2 (default)</string>
+  <string name="pref_camera_sharpness_entry_level3">Level 3</string>
+  <string name="pref_camera_sharpness_entry_level4">Level 4</string>
+  <string name="pref_camera_sharpness_entry_level5">Level 5</string>
+  <string name="pref_camera_sharpness_entry_level6">Level 6</string>
   <!-- Contrast -->
+  <string name="pref_camera_contrast_title">Contrast</string>
+  <string name="pref_camera_contrast_entry_level0">Level 0</string>
+  <string name="pref_camera_contrast_entry_level1">Level 1</string>
+  <string name="pref_camera_contrast_entry_level2">Level 2</string>
+  <string name="pref_camera_contrast_entry_level3">Level 3</string>
+  <string name="pref_camera_contrast_entry_level4">Level 4</string>
+  <string name="pref_camera_contrast_entry_level5">Level 5 (default)</string>
+  <string name="pref_camera_contrast_entry_level6">Level 6</string>
+  <string name="pref_camera_contrast_entry_level7">Level 7</string>
+  <string name="pref_camera_contrast_entry_level8">Level 8</string>
+  <string name="pref_camera_contrast_entry_level9">Level 9</string>
+  <string name="pref_camera_contrast_entry_level10">Level 10</string>
   <!-- Saturation -->
+  <string name="pref_camera_saturation_title">Saturation</string>
+  <string name="pref_camera_saturation_entry_level0">Level 0</string>
+  <string name="pref_camera_saturation_entry_level1">Level 1</string>
+  <string name="pref_camera_saturation_entry_level2">Level 2</string>
+  <string name="pref_camera_saturation_entry_level3">Level 3</string>
+  <string name="pref_camera_saturation_entry_level4">Level 4</string>
+  <string name="pref_camera_saturation_entry_level5">Level 5 (default)</string>
+  <string name="pref_camera_saturation_entry_level6">Level 6</string>
+  <string name="pref_camera_saturation_entry_level7">Level 7</string>
+  <string name="pref_camera_saturation_entry_level8">Level 8</string>
+  <string name="pref_camera_saturation_entry_level9">Level 9</string>
+  <string name="pref_camera_saturation_entry_level10">Level 10</string>
   <!-- Picture format -->
+  <string name="pref_camera_picture_format_title">Picture format</string>
   <!-- Picture quality -->
+  <string name="pref_camera_jpegquality_title">Picture quality</string>
+  <string name="pref_camera_jpegquality_entry_0">55%</string>
+  <string name="pref_camera_jpegquality_entry_1">65% (normal)</string>
+  <string name="pref_camera_jpegquality_entry_2">75% (fine)</string>
+  <string name="pref_camera_jpegquality_entry_3">85% (super fine)</string>
+  <string name="pref_camera_jpegquality_entry_4">95%</string>
+  <string name="pref_camera_jpegquality_entry_5">100%</string>
   <!-- Histogram -->
+  <string name="pref_camera_histogram_title">Histogram</string>
   <!-- Auto scene detection -->
+  <string name="pref_camera_scenedetect_title">Auto scene detection</string>
   <!-- Continuous shot -->
+  <string name="pref_camera_longshot_title">Continuous shot</string>
   <!-- Auto HDR -->
+  <string name="pref_camera_auto_hdr_title">Auto HDR</string>
   <!-- HDR mode -->
+  <string name="pref_camera_hdr_mode_title">HDR mode</string>
+  <string name="pref_camera_hdr_mode_entry_sensor">Sensor HDR</string>
+  <string name="pref_camera_hdr_mode_entry_multi_frame">Multi-frame HDR</string>
   <!-- HDR needs 1x frame -->
+  <string name="pref_camera_hdr_need_1x_title">HDR needs 1x frame</string>
   <!-- Video rotation -->
+  <string name="pref_camera_video_rotation_title">Video rotation</string>
+  <string name="pref_camera_video_rotation_entry_0">0 degrees</string>
+  <string name="pref_camera_video_rotation_entry_90">90 degrees</string>
+  <string name="pref_camera_video_rotation_entry_180">180 degrees</string>
+  <string name="pref_camera_video_rotation_entry_270">270 degrees</string>
   <!-- Storage location -->
+  <string name="pref_camera_savepath_title">Storage location</string>
+  <string name="pref_camera_savepath_entry_0">Internal storage</string>
+  <string name="pref_camera_savepath_entry_1">SD card</string>
   <!-- Misc -->
   <!-- The alias of CameraActivity for gesture operation -->
+  <string name="camera_gesture_title">Launch camera</string>
+  <string name="all_in_focus">All in focus</string>
+  <string name="refocus_toast">To re-focus last photo, tap here</string>
   <!-- Toast messages -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for High-framerate recording mode -->
+  <string name="error_app_unsupported_hfr_selection">High-frame rate recording is not supported when using Stabilisation/Time lapse/HDR.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for Slow motion mode -->
+  <string name="error_app_unsupported_hfr">Slow motion mode is not supported for the selected video size. Select a lower video size</string>
   <!-- The message is shown in toast when the app encounters an unsupported resolution for Stabilization mode -->
+  <string name="error_app_unsupported_dis">Stabilisation is not supported for the selected video size. Select a lower video size</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for High speed mode -->
+  <string name="error_app_unsupported_hsr">High speed mode is not supported for the selected video size. Select a lower video size</string>
   <!-- The message is shown in dialog when the app encounters an unsupported video codec for HFR mode -->
+  <string name="error_app_unsupported_hfr_codec">Only H264 video encoding is supported when HFR is ON</string>
   <!-- The message is shown in dialog when the app encounters an unsupported video resolution-->
+  <string name="error_app_unsupported">Unsupported video resolution for this encoder type</string>
   <!--The message is shown in dialog when the raw snapshot is selected in Zero shutter lag mode-->
+  <string name="error_app_unsupported_raw">Raw picture format is not supported in Zero shutter lag mode. Select JPEG</string>
+  <string name="msg_cancel_longshot_for_limited_memory">Running out of memory, cancelling continuous shot</string>
   <!-- Toast showing non-supported functionality for flash in AE bracket -->
+  <string name="flash_aebracket_message">Flash is not supported in AE bracketing mode</string>
   <!-- toast message for storage location switch -->
+  <string name="on_switch_save_path_to_sdcard">Internal storage space is not enough, switched storage location to SD card</string>
   <!-- The message is shown in toast when click showOnMap Menu and there is no map app -->
+  <string name="map_activity_not_found_err">There is no maps app installed to show the location</string>
   <!-- Continous shot enable message -->
+  <string name="longshot_enable_message">Advanced features are not supported in continuous shot mode</string>
   <!-- Advance features enable message -->
+  <string name="advance_feature_enable_msg">Continuous shot is not supported when advanced features are enabled</string>
   <!-- Toast after enable HDR function to inform continuous shot has disabled -->
+  <string name="HDR_disable_continuous_shot">Enabling HDR will disable continuous shot</string>
   <!-- Toast after enable advanced capture function to inform continuous shot has disabled -->
+  <string name="advanced_capture_disable_continuous_shot">Enabling advanced capture will disable continuous shot</string>
   <!-- Toast after enable 2k4k video quality to inform IS has disabled -->
+  <string name="video_quality_4k_disable_IS">Enabling 4k video size will disable Stabilisation</string>
   <!-- Toast after 2k4k video is enabled to inform SeeMore has been disabled -->
+  <string name="video_quality_4k_disable_SeeMore">SeeMore cannot be enabled during 4k video</string>
   <!-- Toast after SeeMore has been enabled to show CDS is disabled -->
+  <string name="disable_CDS_during_SeeMore">Enabling SeeMore will disable CDS</string>
   <!-- Toast after SeeMore has been enabled to show TNR is disabled -->
+  <string name="disable_TNR_during_SeeMore">Enabling SeeMore will disable TNR</string>
   <!-- TODO: Remove these? -->
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index b9b98620d..939ef4761 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -16,84 +16,177 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- The name of the Android Camera application. [CHAR LIMIT=16] -->
+  <string name="app_name">Camera</string>
   <!-- The label for the Video Camera activity. [CHAR LIMIT=16] -->
+  <string name="video_camera_label">Camcorder</string>
   <!-- Used to format short video duration in Details dialog. minutes:seconds e.g. 00:30 -->
+  <string name="details_ms">%1$02d:%2$02d</string>
   <!-- Used to format video duration in Details dialog. hours:minutes:seconds e.g. 0:21:30 -->
+  <string name="details_hms">%1$d:%2$02d:%3$02d</string>
   <!-- Displayed in the title of the dialog for things to do with a picture
              that is to be "set as" (e.g. set as contact photo or set as wallpaper) -->
+  <string name="set_image">Set picture as</string>
   <!-- Details dialog "OK" button. Dismisses dialog. -->
+  <string name="delete">Delete</string>
   <!-- String Delete the selected media item(s) [CHAR LIMIT=50] -->
+  <plurals name="delete_selection">
+    <item quantity="one">Delete selected item?</item>
+    <item quantity="other">Delete selected items?</item>
+  </plurals>
+  <string name="share">Share</string>
+  <string name="share_panorama">Share panorama</string>
+  <string name="share_as_photo">Share as photo</string>
   <!-- The label shown after an image is deleted [CHAR LIMIT=16] -->
+  <string name="deleted">Deleted</string>
   <!-- The label on the button which when clicked will undo a deletion of image [CHAR LIMIT=16]-->
+  <string name="undo">UNDO</string>
+  <string name="details">Details</string>
+  <string name="close">Close</string>
   <!-- String indicating how many media item(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
+  <plurals name="number_of_items_selected">
+    <item quantity="one">%1$d selected</item>
+    <item quantity="other">%1$d selected</item>
+  </plurals>
   <!-- String indicating how many media album(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
+  <plurals name="number_of_albums_selected">
+    <item quantity="one">%1$d selected</item>
+    <item quantity="other">%1$d selected</item>
+  </plurals>
   <!-- String indicating how many media group(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
+  <plurals name="number_of_groups_selected">
+    <item quantity="one">%1$d selected</item>
+    <item quantity="other">%1$d selected</item>
+  </plurals>
   <!-- String indicating timestamp of photo or video -->
+  <string name="show_on_map">Show on map</string>
+  <string name="rotate_left">Rotate left</string>
+  <string name="rotate_right">Rotate right</string>
   <!-- String used as a menu label. The user can choose to edit the image
          [CHAR_LIMIT=20]-->
+  <string name="edit">Edit</string>
   <!-- The title of the menu item to let user crop the image. [CHAR LIMIT=15] -->
+  <string name="crop_action">Crop</string>
   <!-- The title of the menu item to let user trim the video. [CHAR LIMIT=15] -->
+  <string name="trim_action">Trim</string>
   <!-- The title of the menu item to let user set the image as background etc. [CHAR LIMIT=15] -->
+  <string name="set_as">Set as</string>
   <!-- String indicating an error when playing the video. [CHAR LIMIT=30] -->
+  <string name="video_err">Can\'t play video.</string>
   <!-- Toast message shown when the cropped image has been saved in the
          %s folder (string: folder_download) [CHAR LIMIT=50]-->
+  <string name="crop_saved">
+        Cropped image saved to <xliff:g id="folder_name">%s</xliff:g>.</string>
   <!-- Text indicating the title of a media item in details window [CHAR LIMIT=14] -->
+  <string name="title">Title</string>
   <!-- Text indicating the description of a media item in details window [CHAR LIMIT=14] -->
+  <string name="description">Description</string>
   <!-- Text indicating the creation time of a media item in details window [CHAR LIMIT=14] -->
+  <string name="time">Time</string>
   <!-- Text indicating the location of a media item in details window [CHAR LIMIT=14] -->
+  <string name="location">Location</string>
   <!-- Text indicating the path of a media item in details window [CHAR LIMIT=14] -->
+  <string name="path">Path</string>
   <!-- Text indicating the width of a media item in details window [CHAR LIMIT=14] -->
+  <string name="width">Width</string>
   <!-- Text indicating the height of a media item in details window [CHAR LIMIT=14] -->
+  <string name="height">Height</string>
   <!-- Text indicating the orientation of a media item in details window [CHAR LIMIT=14] -->
+  <string name="orientation">Orientation</string>
   <!-- Text indicating the duration of a video item in details window [CHAR LIMIT=18] -->
+  <string name="duration">Duration</string>
   <!-- Text indicating the mime type of a media item in details window [CHAR LIMIT=14] -->
+  <string name="mimetype">MIME type</string>
   <!-- Text indicating the file size of a media item in details window [CHAR LIMIT=14] -->
+  <string name="file_size">File size</string>
   <!-- Text indicating the maker of a media item in details window [CHAR LIMIT=14] -->
+  <string name="maker">Maker</string>
   <!-- Text indicating the model of a media item in details window [CHAR LIMIT=14] -->
+  <string name="model">Model</string>
   <!-- Text indicating flash info of a media item in details window [CHAR LIMIT=14] -->
+  <string name="flash">Flash</string>
   <!-- Text indicating aperture of a media item in details window [CHAR LIMIT=14] -->
+  <string name="aperture">Aperture</string>
   <!-- Text indicating the focal length of a media item in details window [CHAR LIMIT=14] -->
+  <string name="focal_length">Focal Length</string>
   <!-- Text indicating the white balance of a media item in details window [CHAR LIMIT=18] -->
+  <string name="white_balance">White balance</string>
   <!-- Text indicating the exposure time of a media item in details window [CHAR LIMIT=14] -->
+  <string name="exposure_time">Exposure time</string>
   <!-- Text indicating the ISO speed rating of a media item in details window [CHAR LIMIT=14] -->
+  <string name="iso">ISO</string>
   <!-- String indicating the time units in seconds. [CHAR LIMIT=8] -->
   <!-- String indicating the length units in milli-meters. [CHAR LIMIT=8] -->
+  <string name="unit_mm">mm</string>
   <!-- String indicating how camera shooting feature is used. [CHAR LIMIT=12] -->
+  <string name="manual">Manual</string>
   <!-- String indicating how camera shooting feature is used. [CHAR LIMIT=12 -->
+  <string name="auto">Auto</string>
   <!-- String indicating camera flash is fired. [CHAR LIMIT=14] -->
+  <string name="flash_on">Flash fired</string>
   <!-- String indicating camera flash is not used. [CHAR LIMIT=14] -->
+  <string name="flash_off">No flash</string>
   <!-- String indicating image width or height is unknown. [CHAR LIMIT=14] -->
+  <string name="unknown">Unknown</string>
   <!-- Toast message shown after we try to make a local album available offline
          [CHAR LIMIT=150] -->
+  <string name="try_to_set_local_album_available_offline">
+        This item is stored locally and available offline.</string>
   <!-- The content of a dialog showing trimming in progress. [CHAR LIMIT=30] -->
+  <string name="please_wait">Please wait</string>
   <!-- Text to show with progress bar while stitching a photo sphere. 'Photo sphere' is a product name. [CHAR LIMIT=35]-->
+  <string name="rendering_photo_sphere">Rendering photo sphere</string>
   <!-- title for the dialog showing the error of camera hardware -->
+  <string name="camera_error_title">Camera error</string>
   <!-- message for the dialog showing the error of camera hardware -->
+  <string name="cannot_connect_camera">Can\'t connect to the camera.</string>
   <!-- message for the dialog showing the camera is disabled because of security policies. Camera cannot be used. -->
+  <string name="camera_disabled">Camera has been disabled because of security policies.</string>
   <!-- message for the dialog showing that the app does not have sufficient permissions [CHAR LIMIT=NONE] -->
+  <string name="error_permissions">The app does not have critical permissions needed to run. Please check your permissions settings.</string>
   <!-- Dialog "Dismiss" button. Closes the dialog [CHAR LIMIT=12]-->
+  <string name="dialog_dismiss">Dismiss</string>
   <!-- alert to the user to wait for some operation to complete -->
+  <string name="wait">Please wait\u2026</string>
   <!-- alert to the user that an SD card must be installed before using the camera -->
+  <string name="no_storage" product="default">Insert an SD card before using the camera.</string>
   <!-- alert to the user that the SD card is being disk-checked -->
+  <string name="preparing_sd" product="default">Preparing SD card\u2026</string>
   <!-- alert to the user that the camera fails to read or write the SD card. -->
+  <string name="access_sd_fail" product="default">Couldn\'t access SD card.</string>
   <!-- A label that overlays on top of the preview frame to indicate the camcorder is in time lapse mode [CHAR LIMIT=35] -->
+  <string name="time_lapse_title">Time lapse recording</string>
   <!-- Screen display message during image capture to indicate that the capture is in progress, like during HDR+. [CHAR LIMIT=20] -->
+  <string name="capturing">Capturing</string>
   <!-- Settings screen, camera selection dialog title. Users can select a camera from the phone (front-facing or back-facing). [CHAR LIMIT=20] -->
+  <string name="pref_camera_id_title">Choose camera</string>
   <!-- In select camera setting, back facing camera. [CHAR LIMIT=14] -->
+  <string name="pref_camera_id_entry_back">Back</string>
   <!-- In select camera setting, front-facing camera. [CHAR LIMIT=14] -->
+  <string name="pref_camera_id_entry_front">Front</string>
   <!-- Settings screen, setting title text -->
+  <string name="pref_camera_recordlocation_title">Store location</string>
   <!--  Label for record location preference [CHAR LIMIT=50] -->
+  <string name="pref_camera_location_label">LOCATION</string>
   <!-- Title for countdown timer on camera settings screen [CHAR LIMIT=30]-->
+  <string name="pref_camera_timer_title">Countdown timer</string>
   <!-- Entry for countdown timer setting. e.g. 1 second, 10 seconds, etc. [CHAR LIMIT=30]-->
+  <plurals name="pref_camera_timer_entry">
+    <item quantity="one">1 second</item>
+    <item quantity="other">%d seconds</item>
+  </plurals>
   <!-- Text followed by a checkbox to turn on/off sound effects during the countdown. [CHAR LIMIT = 24]-->
+  <string name="pref_camera_timer_sound_title">Beep during countdown</string>
   <!-- Entry of a on/off setting. The setting is turned off. [CHAR LIMIT=15] -->
+  <string name="setting_off">Off</string>
   <!-- Entry of a on/off setting. The setting is turned on. [CHAR LIMIT=15] -->
+  <string name="setting_on">On</string>
   <!-- The value of a camera preference indicating the setting is off. -->
   <!-- The value of a camera preference indicating the setting is on. -->
   <!-- The Video quality settings in preference [CHAR LIMIT=21] -->
+  <string name="pref_video_quality_title">Video quality</string>
   <!-- The default quality value is NULL -->
   <!-- Video quality setting entry.
     Videos will be recorded in 4k DCI quality. [CHAR LIMIT=24] -->
@@ -104,170 +197,334 @@
   <!-- Video quality setting entry. Videos will be recorded in 480p quality. [CHAR LIMIT=24] -->
   <!-- Describes the preference dialog for choosing interval between frame capture for
     time lapse recording. Appears at top of the dialog. [CHAR LIMIT=30] -->
+  <string name="pref_video_time_lapse_frame_interval_title">Time lapse</string>
   <!-- Settings screen, Camera setting category title -->
+  <string name="pref_camera_settings_category">Camera settings</string>
   <!-- Settings screen, Camcorder setting category title -->
+  <string name="pref_camcorder_settings_category">Camcorder settings</string>
   <!-- Settings screen, Picture size title -->
+  <string name="pref_camera_picturesize_title">Picture size</string>
   <!-- Settings screen, Focus mode title -->
+  <string name="pref_camera_focusmode_title">Focus mode</string>
   <!-- Settings screen, Focus mode dialog radio button choices -->
+  <string name="pref_camera_focusmode_entry_auto">Auto</string>
   <!-- A setting that lets the camera focus into infinity. [CHAR LIMIT=20] -->
+  <string name="pref_camera_focusmode_entry_infinity">Infinity</string>
   <!-- A setting that lets the camera operate in macro focus mode for nearby objects. [CHAR LIMIT=20] -->
+  <string name="pref_camera_focusmode_entry_macro">Macro</string>
   <!-- Menu, focus mode labels [CHAR LIMIT=50] -->
+  <string name="pref_camera_focusmode_label_auto">AUTO</string>
+  <string name="pref_camera_focusmode_label_infinity">INFINITY</string>
+  <string name="pref_camera_focusmode_label_macro">MACRO</string>
   <!-- Default flash mode setting.-->
   <!-- Value for flash off setting-->
   <!-- Settings screen, Flash mode title -->
+  <string name="pref_camera_flashmode_title">Flash mode</string>
   <!-- flash label [CHAR LIMIT=50] -->
+  <string name="pref_camera_flashmode_label">FLASH MODE</string>
   <!-- Settings screen, Flash mode 'auto'. [CHAR LIMIT=12] -->
+  <string name="pref_camera_flashmode_entry_auto">Auto</string>
   <!-- Settings screen, Flash mode 'alway on'. [CHAR LIMIT=12] -->
+  <string name="pref_camera_flashmode_entry_on">On</string>
   <!-- Settings screen, Flash mode 'always off'. [CHAR LIMIT=12] -->
+  <string name="pref_camera_flashmode_entry_off">Off</string>
   <!-- Menu, flash mode labels [CHAR LIMIT=50] -->
+  <string name="pref_camera_flashmode_label_auto">FLASH AUTO</string>
+  <string name="pref_camera_flashmode_label_on">FLASH ON</string>
+  <string name="pref_camera_flashmode_label_off">FLASH OFF</string>
   <!-- Default videocamera flash mode setting.-->
   <!-- Default white balance setting. -->
   <!-- Settings screen, white balance title -->
+  <string name="pref_camera_whitebalance_title">White balance</string>
   <!-- Menu, white balance label -->
+  <string name="pref_camera_whitebalance_label">WHITE BALANCE</string>
   <!-- Settings screen, White balance dialog radio button choices -->
+  <string name="pref_camera_whitebalance_entry_auto">Auto</string>
+  <string name="pref_camera_whitebalance_entry_incandescent">Incandescent</string>
+  <string name="pref_camera_whitebalance_entry_daylight">Daylight</string>
+  <string name="pref_camera_whitebalance_entry_fluorescent">Fluorescent</string>
+  <string name="pref_camera_whitebalance_entry_cloudy">Cloudy</string>
   <!-- Menu, White balance labels [CHAR LIMIT=50] -->
+  <string name="pref_camera_whitebalance_label_auto">AUTO</string>
+  <string name="pref_camera_whitebalance_label_incandescent">INCANDESCENT</string>
+  <string name="pref_camera_whitebalance_label_daylight">DAYLIGHT</string>
+  <string name="pref_camera_whitebalance_label_fluorescent">FLUORESCENT</string>
+  <string name="pref_camera_whitebalance_label_cloudy">CLOUDY</string>
   <!-- Default scene mode setting. -->
   <!-- Settings screen, Select Scene mode -->
+  <string name="pref_camera_scenemode_title">Scene mode</string>
   <!-- Settings menu, scene mode choices [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_auto">Auto</string>
   <!-- Scene mode that uses HDR plus (better HDR) [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_hdr_plus">HDR+</string>
   <!-- Scene mode that uses HDR (high dynamic range) [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_hdr">HDR</string>
   <!-- Scene mode to turn on HDR (better high dynamic range) [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_entry_turn_hdr_plus_on">HDR+ ON</string>
   <!-- Scene mode to turn off HDR (better high dynamic range) [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_entry_turn_hdr_plus_off">HDR+ OFF</string>
   <!-- Scene mode to turn on HDR (high dynamic range) [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_entry_turn_hdr_on">HDR ON</string>
   <!-- Scene mode to turn off HDR (high dynamic range) [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_entry_turn_hdr_off">HDR OFF</string>
   <!-- Scene mode that takes an image quickly with little motion blur. [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_action">Action</string>
   <!-- Scene mode that takes long exposures to capture night scenes without flash. [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_night">Night</string>
   <!-- Scene mode optimized for taking images in the sunset. [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_sunset">Sunset</string>
   <!-- Scene mode optimized for taking indoor low-lights pictures. [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_party">Party</string>
   <!-- Settings menu, scene mode labels [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_label_auto">NONE</string>
   <!-- Scene mode that takes an image quickly with little motion blur. [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_label_action">ACTION</string>
   <!-- Scene mode that takes long exposures to capture night scenes without flash. [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_label_night">NIGHT</string>
   <!-- Scene mode optimized for taking images in the sunset. [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_label_sunset">SUNSET</string>
   <!-- Scene mode optimized for taking indoor low-lights pictures. [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_label_party">PARTY</string>
   <!-- Settings menu countdown timer off [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_off">TIMER OFF</string>
   <!-- Settings menu countdown timer 1 second [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_one">1 SECOND</string>
   <!-- Settings menu countdown timer 3 seconds [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_three">3 SECONDS</string>
   <!-- Settings menu countdown timer 10 seconds [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_ten">10 SECONDS</string>
   <!-- Settings menu countdown timer 15 seconds [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_fifteen">15 SECONDS</string>
   <!-- Toast after trying to select a setting that is not allowed to change in scene mode [CHAR LIMIT=NONE] -->
+  <string name="not_selectable_in_scene_mode">Not selectable in scene mode.</string>
   <!-- Exposure settings in preference -->
+  <string name="pref_exposure_title">Exposure</string>
   <!--  menu label exposure compensation [CHAR LIMIT=50] -->
+  <string name="pref_exposure_label">EXPOSURE</string>
   <!-- Default HDR entry value -->
   <!-- Default HDR+ entry value -->
   <!-- HDR label ON [CHAR LIMIT=60] -->
+  <string name="pref_camera_hdr_label">HDR</string>
   <!-- switch camera label back [CHAR LIMIT=60] -->
+  <string name="pref_camera_id_label_back">FRONT CAMERA</string>
   <!-- switch camera label front [CHAR LIMIT=60] -->
+  <string name="pref_camera_id_label_front">BACK CAMERA</string>
   <!-- Dialog "OK" button. Dismisses dialog. -->
+  <string name="dialog_ok">OK</string>
   <!-- Low-memory dialog message [CHAR LIMIT=NONE] -->
+  <string name="spaceIsLow_content" product="default">Your SD card is running out of space. Change the quality setting or delete some images or other files.</string>
   <!-- Camera format string for new image files. Passed to java.text.SimpleDateFormat. -->
   <!-- Video Camera format string for new video files. Passed to java.text.SimpleDateFormat. -->
   <!-- Filename prefix for panorama output. -->
   <!-- The message shown when video record reaches size limit. -->
+  <string name="video_reach_size_limit">Size limit reached.</string>
   <!-- The text shown when the panorama panning speed is to fast [CHAR LIMIT=16] -->
+  <string name="pano_too_fast_prompt">Too fast</string>
   <!-- The text shown in the progress dialog when panorama preview is generating in the background [CHAR LIMIT=30] -->
+  <string name="pano_dialog_prepare_preview">Preparing panorama</string>
   <!-- The text shown in the dialog when panorama saving failed [CHAR LIMIT=40] -->
+  <string name="pano_dialog_panorama_failed">Couldn\'t save panorama.</string>
   <!-- The text shown on the dialog title in the dialogs for Panorama [CHAR LIMIT=12] -->
+  <string name="pano_dialog_title">Panorama</string>
   <!-- The text shown on the top-left corner of the screen to indicate the capturing is on going [CHAR LIMIT=27] -->
+  <string name="pano_capture_indication">Capturing panorama</string>
   <!-- The text shown in the progress dialog when waiting for previous panorama finishing [CHAR LIMIT=40] -->
+  <string name="pano_dialog_waiting_previous">Waiting for previous panorama</string>
   <!-- The text shown on the bottom-left corner of the screen to indicate that the saving is in process [CHAR LIMIT=13] -->
+  <string name="pano_review_saving_indication_str">Saving\u2026</string>
   <!-- The text shown on the screen to indicate that the panorama is rendering [CHAR LIMIT=27] -->
+  <string name="pano_review_rendering">Rendering panorama</string>
   <!-- Toast telling users tapping on the viewfinder will trigger autofocus [CHAR LIMIT=28] -->
+  <string name="tap_to_focus">Touch to focus.</string>
   <!-- Default effect setting that clears the effect. -->
   <!-- Title of video effect setting popup window -->
+  <string name="pref_video_effect_title">Effects</string>
   <!-- Effect setting item that clear the effect. [CHAR LIMIT=14] -->
+  <string name="effect_none">None</string>
   <!-- Effect setting item that squeezes the face. [CHAR LIMIT=14] -->
+  <string name="effect_goofy_face_squeeze">Squeeze</string>
   <!-- Effect setting item that makes eyes big. [CHAR LIMIT=14] -->
+  <string name="effect_goofy_face_big_eyes">Big eyes</string>
   <!-- Effect setting item that makes mouth big. [CHAR LIMIT=14] -->
+  <string name="effect_goofy_face_big_mouth">Big mouth</string>
   <!-- Effect setting item that makes mouth small. [CHAR LIMIT=14] -->
+  <string name="effect_goofy_face_small_mouth">Small mouth</string>
   <!-- Effect setting item that makes nose big. [CHAR LIMIT=14] -->
+  <string name="effect_goofy_face_big_nose">Big nose</string>
   <!-- Effect setting item that makes eyes small. [CHAR LIMIT=14] -->
+  <string name="effect_goofy_face_small_eyes">Small eyes</string>
   <!-- Effect setting item that replaces background with Android in Space. [CHAR LIMIT=14] -->
+  <string name="effect_backdropper_space">In space</string>
   <!-- Effect setting item that replaces background with a sunset. [CHAR LIMIT=14] -->
+  <string name="effect_backdropper_sunset">Sunset</string>
   <!-- Effect setting item that replaces background with video from gallery. [CHAR LIMIT=14] -->
+  <string name="effect_backdropper_gallery">Your video</string>
   <!-- Toast telling users tapping on the viewfinder will take a picture [CHAR LIMIT=54] -->
+  <string name="video_snapshot_hint">Touch to take photo while recording.</string>
   <!-- Announcement telling users video recording has just started [CHAR LIMIT=NONE] -->
+  <string name="video_recording_started">Video recording has started.</string>
   <!-- Announcement telling users video recording has just stopped [CHAR LIMIT=NONE] -->
+  <string name="video_recording_stopped">Video recording has stopped.</string>
   <!-- A button in effect setting popup to clear the effect. [CHAR LIMIT=26] -->
+  <string name="clear_effects">Clear effects</string>
   <!-- Title of category for silly face effects. [CHAR LIMIT=26] -->
+  <string name="effect_silly_faces">SILLY FACES</string>
   <!-- Title of category for background replacement effects. [CHAR LIMIT=26] -->
+  <string name="effect_background">BACKGROUND</string>
   <!-- The shutter button. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_shutter_button">Shutter</string>
   <!-- The menu button. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_menu_button">Menu button</string>
   <!-- The mode picker to switch between camera, video and panorama. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_mode_picker">Camera, video or panorama selector</string>
   <!-- The check box in camera settings, such as store location. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_check_box">%1$s check box</string>
   <!-- The button to switch to Camera mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_camera">Switch to photo</string>
   <!-- The button to switch to Video mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_video">Switch to video</string>
   <!-- The button to switch to Panorama mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_panorama">Switch to panorama</string>
   <!-- The button to switch to the Photo Sphere mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_photo_sphere">Switch to Photo Sphere</string>
   <!-- The button to switch to the high quality mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_gcam">Switch to high quality</string>
   <!-- The button in review mode indicating that the photo taking, video recording, and panorama saving session should be canceled [CHAR LIMIT = NONE] -->
+  <string name="accessibility_review_cancel">Review cancel</string>
   <!-- The button in review mode indicating that the taken photo/video is OK to be attached/uploaded [CHAR LIMIT = NONE] -->
+  <string name="accessibility_review_ok">Review done</string>
   <!-- button in review mode indicate the user want to retake another photo/video for attachment [
 CHAR LIMIT = NONE] -->
+  <string name="accessibility_review_retake">Review retake</string>
   <!-- Default text for a button that can be toggled on and off. -->
+  <string name="capital_on">ON</string>
   <!-- Default text for a button that can be toggled on and off. -->
+  <string name="capital_off">OFF</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_off">Off</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_500">0.5 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_1000">1 second</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_1500">1.5 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_2000">2 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_2500">2.5 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_3000">3 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_4000">4 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_5000">5 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_6000">6 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_10000">10 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_12000">12 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_15000">15 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_24000">24 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_30000">30 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_60000">1 minute</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_90000">1.5 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_120000">2 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_150000">2.5 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_180000">3 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_240000">4 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_300000">5 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_360000">6 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_600000">10 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_720000">12 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_900000">15 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_1440000">24 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_1800000">30 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_3600000">1 hour</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_5400000">1.5 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_7200000">2 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_9000000">2.5 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_10800000">3 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_14400000">4 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_18000000">5 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_21600000">6 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_36000000">10 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_43200000">12 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_54000000">15 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_86400000">24 hours</string>
   <!-- Seconds: a unit of time for time lapse intervals. [CHAR LIMIT = 20] -->
+  <string name="time_lapse_seconds">seconds</string>
   <!-- Minutes: a unit of time for time lapse intervals. [CHAR LIMIT = 20] -->
+  <string name="time_lapse_minutes">minutes</string>
   <!-- Hours: a unit of time for time lapse intervals. [CHAR LIMIT = 20] -->
+  <string name="time_lapse_hours">hours</string>
   <!-- The button to confirm time-lapse setting changes. [CHAR LIMIT = 20] -->
+  <string name="time_lapse_interval_set">Done</string>
   <!-- Title in time interval picker for setting time interval. [CHAR LIMIT = 30]-->
+  <string name="set_time_interval">Set Time Interval</string>
   <!-- Help text that is shown when the time lapse feature is turned off. [CHAR LIMIT = 180]-->
+  <string name="set_time_interval_help">Time lapse feature is off. Turn it on to set time interval.</string>
   <!-- Title in timer setting for setting the duration for the countdown timer. [CHAR LIMIT = 50]-->
+  <string name="set_duration">Set duration in seconds</string>
   <!-- On-screen hint during timer countdown for taking a photo. [CHAR LIMIT = 60]-->
+  <string name="count_down_title_text">Counting down to take a photo</string>
   <!-- Title for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 50] -->
+  <string name="remember_location_title">Remember photo locations?</string>
   <!-- Message for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = None] -->
+  <string name="remember_location_prompt">Tag your photos and videos with the locations where they are taken.\n\nOther apps can access this information along with your saved images.</string>
   <!-- Negative answer for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 20] -->
+  <string name="remember_location_no">No thanks</string>
   <!-- Positive answer for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 20] -->
+  <string name="remember_location_yes">Yes</string>
   <!-- Camera menu labels -->
   <!-- more options label [CHAR LIMIT=50] -->
+  <string name="camera_menu_more_label">MORE OPTIONS</string>
   <!-- settings label [CHAR LIMIT=50] -->
+  <string name="camera_menu_settings_label">SETTINGS</string>
   <!--  Tiny Planet -->
   <!-- Button to press for creating a tiny planet image. [CHAR LIMIT = 30] -->
+  <string name="create_tiny_planet">Create Tiny Planet</string>
   <!-- Message shown while a tiny planet image is being saved. [CHAR LIMIT = 30] -->
+  <string name="saving_tiny_planet">Saving Tiny Planet&#8230;</string>
   <!-- Label above a slider that let's the user set the zoom of a tiny planet image. [CHAR LIMIT = 15] -->
+  <string name="tiny_planet_zoom">Zoom</string>
   <!-- Label above a slider that let's the user set the rotation of a tiny planet image. [CHAR LIMIT = 15] -->
+  <string name="tiny_planet_rotate">Rotate</string>
   <!-- Crop -->
   <!-- Label for the save button in the crop activity action bar [CHAR LIMIT=20] -->
+  <string name="crop_save">Save</string>
   <!--  String shown when we cannot load the image when starting the activity [CHAR LIMIT=NONE] -->
+  <string name="cannot_load_image">Cannot load the image!</string>
   <!-- Label for album filmstrip button -->
+  <string name="switch_photo_filmstrip">Filmstrip view</string>
   <!--  String shown when setting the homepage wallpaper in the background [CHAR LIMIT=NONE] -->
+  <string name="setting_wallpaper">Setting wallpaper</string>
 </resources>
diff --git a/res/values-en-rIN/cm_strings.xml b/res/values-en-rIN/cm_strings.xml
index 92cc92c93..93b3bf66e 100644
--- a/res/values-en-rIN/cm_strings.xml
+++ b/res/values-en-rIN/cm_strings.xml
@@ -18,17 +18,92 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- common aspect ratios -->
   <!-- aspect ratio greater than 16:9, so "widescreen" or "cinematic" -->
+  <string name="pref_camera_aspectratio_wide">Wide</string>
   <!-- Format for entries in the picture size menu. Parameter one is aspect ratio,
          parameter two is size in megapixels, e.g. "(4:3) 12.1 megapixels"
          NOTE: for Chinese (zh) and Korean (ko) the pixel number (parameter two)
          will be multiplied by 100 as those languages want to count by ten thousands -->
+  <string name="pref_camera_megapixel_format">(<xliff:g id="ratio" example="16:9">%1$s</xliff:g>) <xliff:g id="pixels">%2$1.1f</xliff:g> megapixels</string>
   <!-- Settings screen, scene mode -->
+  <string name="pref_camera_scenemode_entry_refocus">Macro+</string>
+  <string name="pref_camera_scenemode_entry_antimotionblur">Motion blur reduction</string>
+  <string name="pref_camera_scenemode_entry_aqua">Aqua</string>
+  <string name="pref_camera_scenemode_entry_ar">Augmented reality</string>
+  <string name="pref_camera_scenemode_entry_asd">Best shot</string>
+  <string name="pref_camera_scenemode_entry_baby">Baby</string>
+  <string name="pref_camera_scenemode_entry_backgroundblur">Background blur</string>
+  <string name="pref_camera_scenemode_entry_backlight">Backlight</string>
+  <string name="pref_camera_scenemode_entry_backlightportrait">Backlight portrait</string>
+  <string name="pref_camera_scenemode_entry_barcode">Barcode</string>
+  <string name="pref_camera_scenemode_entry_beach">Beach</string>
+  <string name="pref_camera_scenemode_entry_beauty">Beauty</string>
+  <string name="pref_camera_scenemode_entry_candlelight">Candlelight</string>
+  <string name="pref_camera_scenemode_entry_cine">Cine</string>
+  <string name="pref_camera_scenemode_entry_closeup">Closeup</string>
+  <string name="pref_camera_scenemode_entry_dark">Dark</string>
+  <string name="pref_camera_scenemode_entry_dish">Dish</string>
+  <string name="pref_camera_scenemode_entry_duskdawn">Duskdawn</string>
+  <string name="pref_camera_scenemode_entry_document">Document</string>
+  <string name="pref_camera_scenemode_entry_fallcolor">Autumn</string>
+  <string name="pref_camera_scenemode_entry_fireworks">Fireworks</string>
+  <string name="pref_camera_scenemode_entry_flowers">Flowers</string>
+  <string name="pref_camera_scenemode_entry_handheldtwilight">Handheld twilight</string>
+  <string name="pref_camera_scenemode_entry_highsensitivity">High sensitivity</string>
+  <string name="pref_camera_scenemode_entry_indoor">Indoor</string>
+  <string name="pref_camera_scenemode_entry_landscape">Landscape</string>
+  <string name="pref_camera_scenemode_entry_mix_illuminant">Mixed lighting</string>
+  <string name="pref_camera_scenemode_entry_mood">Mood</string>
+  <string name="pref_camera_scenemode_entry_nightportrait">Night portrait</string>
+  <string name="pref_camera_scenemode_entry_nightindoor">Night indoor</string>
+  <string name="pref_camera_scenemode_entry_oldfilm">Old film</string>
+  <string name="pref_camera_scenemode_entry_pet">Pet</string>
+  <string name="pref_camera_scenemode_entry_portrait">Portrait</string>
+  <string name="pref_camera_scenemode_entry_snow">Snow</string>
+  <string name="pref_camera_scenemode_entry_softskin">Soft skin</string>
+  <string name="pref_camera_scenemode_entry_sports">Sports</string>
+  <string name="pref_camera_scenemode_entry_spotlight">Spotlight</string>
+  <string name="pref_camera_scenemode_entry_steadyphoto">Steady photo</string>
+  <string name="pref_camera_scenemode_entry_supernight">Dark night</string>
+  <string name="pref_camera_scenemode_entry_sweepstitch">Sweep stitch</string>
+  <string name="pref_camera_scenemode_entry_text">Text</string>
+  <string name="pref_camera_scenemode_entry_theatre">Theatre</string>
+  <string name="pref_camera_scenemode_entry_whiteboard">Whiteboard</string>
   <!-- Settings screen, focus mode -->
+  <string name="pref_camera_focusmode_entry_continuous">Continuous</string>
+  <string name="pref_camera_focusmode_entry_mw_continuous">Continuous (MW)</string>
+  <string name="pref_camera_focusmode_entry_extended">Extended</string>
+  <string name="pref_camera_focusmode_entry_facedetect">Face detect</string>
+  <string name="pref_camera_focusmode_entry_facepriority">Face priority</string>
+  <string name="pref_camera_focusmode_entry_fixed">Fixed</string>
+  <string name="pref_camera_focusmode_entry_normal">Normal</string>
+  <string name="pref_camera_focusmode_entry_portrait">Portrait</string>
+  <string name="pref_camera_focusmode_entry_hyperfocal">Hyperfocal</string>
   <!-- Color effects -->
+  <string name="pref_camera_coloreffect_entry_washed">Washed</string>
+  <string name="pref_camera_coloreffect_entry_vintage_warm">Vintage warm</string>
+  <string name="pref_camera_coloreffect_entry_vintage_cold">Vintage cold</string>
+  <string name="pref_camera_coloreffect_entry_point_blue">Point blue</string>
+  <string name="pref_camera_coloreffect_entry_point_green">Point green</string>
+  <string name="pref_camera_coloreffect_entry_point_red_yellow">Point red-yellow</string>
+  <string name="pref_camera_coloreffect_entry_cartoonize">Cartoonise</string>
   <!-- Red eye flash mode title -->
+  <string name="pref_camera_flashmode_entry_redeye">Red eye</string>
+  <string name="pref_camera_flashmode_label_redeye">RED EYE</string>
   <!-- Power shutter -->
+  <string name="pref_camera_power_shutter_title">Power shutter</string>
   <!-- Max brightness -->
+  <string name="pref_camera_max_brightness_title">Bright screen</string>
   <!-- Touch focus duration -->
+  <string name="pref_camera_focustime_title">Touch focus duration</string>
+  <string name="pref_camera_focustime_entry_0">0s</string>
+  <string name="pref_camera_focustime_entry_3">3s</string>
+  <string name="pref_camera_focustime_entry_5">5s</string>
+  <string name="pref_camera_focustime_entry_10">10s</string>
+  <string name="pref_camera_focustime_entry_infinite">Infinite</string>
   <!-- Shutter speed -->
+  <string name="pref_camera_shutter_speed_title">Shutter speed</string>
+  <string name="auto_hdr_enabled">Auto HDR enabled</string>
   <!-- Advanced options -->
+  <string name="developer_menu_enabled">You have enabled advanced camera options</string>
+  <string name="developer_menu_disabled">You have disabled advanced camera options</string>
 </resources>
diff --git a/res/values-en-rIN/qcomstrings.xml b/res/values-en-rIN/qcomstrings.xml
index 63b1dec74..0921dff3c 100644
--- a/res/values-en-rIN/qcomstrings.xml
+++ b/res/values-en-rIN/qcomstrings.xml
@@ -27,67 +27,247 @@
   <!-- 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] -->
   <!-- Auto exposure -->
+  <string name="pref_camera_autoexposure_title">Auto exposure</string>
+  <string name="pref_camera_autoexposure_entry_centerweighted">Centre weighted</string>
+  <string name="pref_camera_autoexposure_entry_frameaverage">Frame average</string>
+  <string name="pref_camera_autoexposure_entry_spotmetering">Spot metering</string>
   <!-- Video codec -->
+  <string name="pref_camera_videoencoder_title">Video codec</string>
   <!-- Audio codec -->
+  <string name="pref_camera_audioencoder_title">Audio codec</string>
   <!-- Skin tone enhancement -->
+  <string name="pref_camera_skinToneEnhancement_title">Skin tone enhancement</string>
   <!-- Zero shutter lag-->
+  <string name="pref_camera_zsl_title">Zero shutter lag</string>
   <!-- Autofocus zone -->
+  <string name="pref_camera_selectablezoneaf_title">Autofocus zone</string>
+  <string name="pref_camera_selectablezoneaf_entry_auto">Auto</string>
+  <string name="pref_camera_selectablezoneaf_entry_centerweighted">Centre weighted</string>
+  <string name="pref_camera_selectablezoneaf_entry_frameaverage">Frame average</string>
+  <string name="pref_camera_selectablezoneaf_entry_spotmetering">Spot metering</string>
   <!-- Advanced features -->
+  <string name="pref_camera_advanced_features_title">Advanced features</string>
+  <string name="pref_camera_advanced_feature_entry_none">None</string>
+  <string name="pref_camera_advanced_feature_entry_multi_touch_focus">Multi-touch Focus</string>
   <!-- Manual exposure -->
+  <string name="pref_camera_manual_exp_title">Manual exposure</string>
+  <string name="pref_camera_manual_exp_entry_ISO_priority">ISO priority</string>
+  <string name="pref_camera_manual_exp_entry_exptime_priority">Exposure time priority</string>
+  <string name="pref_camera_manual_exp_entry_user_setting">User setting</string>
+  <string name="pref_camera_manual_exp_entry_off">Off</string>
   <!-- Manual white balance -->
+  <string name="pref_camera_manual_wb_title">Manual white balance</string>
+  <string name="pref_camera_manual_wb_entry_color_temperature">Colour temperature</string>
+  <string name="pref_camera_manual_wb_entry_rbgb_gains">RBGB gains</string>
+  <string name="pref_camera_manual_wb_entry_off">Off</string>
   <!-- Manual focus -->
+  <string name="pref_camera_manual_focus_title">Manual focus</string>
+  <string name="pref_camera_manual_focus_entry_scale_mode">Scale mode</string>
+  <string name="pref_camera_manual_focus_entry_diopter_mode">Diopter mode</string>
+  <string name="pref_camera_manual_focus_entry_off">Off</string>
   <!-- Still More -->
   <!-- Video HDR-->
+  <string name="pref_camera_video_hdr_title">Video HDR</string>
   <!-- CDS mode-->
+  <string name="pref_camera_cds_title">CDS mode</string>
+  <string name="pref_camera_cds_entry_auto">Auto</string>
   <!-- Video CDS-->
+  <string name="pref_camera_video_cds_title">Video CDS mode</string>
+  <string name="pref_camera_video_cds_entry_auto">Auto</string>
   <!-- TNR-->
+  <string name="pref_camera_tnr_title">TNR mode</string>
   <!-- Video TNR -->
+  <string name="pref_camera_video_tnr_title">Video TNR mode</string>
   <!-- Face detection -->
+  <string name="pref_camera_facedetection_title">Face detection</string>
   <!-- Selfie Flash -->
+  <string name="pref_selfie_flash_title">Selfie flash</string>
   <!-- Red eye reduction -->
+  <string name="pref_camera_redeyereduction_title">Red eye reduction</string>
   <!-- AE bracketing -->
+  <string name="pref_camera_ae_bracket_hdr_title">AE bracketing</string>
   <!-- High-framerate recording -->
+  <string name="pref_camera_hfr_title">High-framerate recording</string>
+  <string name="pref_camera_hfr_entry_off">Off</string>
+  <string name="pref_camera_hfr_entry_2x">Slow motion 60 FPS</string>
+  <string name="pref_camera_hfr_entry_3x">Slow motion 90 FPS</string>
+  <string name="pref_camera_hfr_entry_4x">Slow motion 120 FPS</string>
+  <string name="pref_camera_hfr_entry_8x">Slow motion 240 FPS</string>
+  <string name="pref_camera_hfr_entry_hsr_60">High speed 60 FPS</string>
+  <string name="pref_camera_hfr_entry_hsr_90">High speed 90 FPS</string>
+  <string name="pref_camera_hfr_entry_hsr_120">High speed 120 FPS</string>
   <!-- See More -->
   <!-- Denoise -->
+  <string name="pref_camera_denoise_title">Denoise</string>
   <!-- ISO -->
+  <string name="pref_camera_iso_title">ISO</string>
+  <string name="pref_camera_iso_entry_auto">Auto</string>
+  <string name="pref_camera_iso_entry_isodeblur">Auto (HJR)</string>
+  <string name="pref_camera_iso_entry_iso50">ISO50</string>
+  <string name="pref_camera_iso_entry_iso100">ISO100</string>
+  <string name="pref_camera_iso_entry_iso125">ISO125</string>
+  <string name="pref_camera_iso_entry_iso150">ISO150</string>
+  <string name="pref_camera_iso_entry_iso200">ISO200</string>
+  <string name="pref_camera_iso_entry_iso250">ISO250</string>
+  <string name="pref_camera_iso_entry_iso300">ISO300</string>
+  <string name="pref_camera_iso_entry_iso320">ISO320</string>
+  <string name="pref_camera_iso_entry_iso350">ISO350</string>
+  <string name="pref_camera_iso_entry_iso400">ISO400</string>
+  <string name="pref_camera_iso_entry_iso450">ISO450</string>
+  <string name="pref_camera_iso_entry_iso500">ISO500</string>
+  <string name="pref_camera_iso_entry_iso600">ISO600</string>
+  <string name="pref_camera_iso_entry_iso640">ISO640</string>
+  <string name="pref_camera_iso_entry_iso700">ISO700</string>
+  <string name="pref_camera_iso_entry_iso800">ISO800</string>
+  <string name="pref_camera_iso_entry_iso1000">ISO1000</string>
+  <string name="pref_camera_iso_entry_iso1200">ISO1200</string>
+  <string name="pref_camera_iso_entry_iso1250">ISO1250</string>
+  <string name="pref_camera_iso_entry_iso1500">ISO1500</string>
+  <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
+  <string name="pref_camera_iso_entry_iso2000">ISO2000</string>
+  <string name="pref_camera_iso_entry_iso2500">ISO2500</string>
+  <string name="pref_camera_iso_entry_iso2700">ISO2700</string>
+  <string name="pref_camera_iso_entry_iso3200">ISO3200</string>
+  <string name="pref_camera_iso_entry_iso6400">ISO6400</string>
+  <string name="pref_camera_iso_entry_iso12800">ISO12800</string>
   <!-- Antibanding -->
+  <string name="pref_camera_antibanding_title">Antibanding</string>
+  <string name="pref_camera_antibanding_entry_0">Auto</string>
+  <string name="pref_camera_antibanding_entry_1">50 Hz (Europe)</string>
+  <string name="pref_camera_antibanding_entry_2">60 Hz (USA)</string>
   <!-- Color effect -->
+  <string name="pref_camera_coloreffect_title">Colour effect</string>
+  <string name="pref_camera_coloreffect_entry_none">None</string>
+  <string name="pref_camera_coloreffect_entry_mono">Mono</string>
+  <string name="pref_camera_coloreffect_entry_sepia">Sepia</string>
+  <string name="pref_camera_coloreffect_entry_negative">Negative</string>
   <!-- Color effect that overexposes and reverses some of the tones. -->
+  <string name="pref_camera_coloreffect_entry_solarize">Solarise</string>
+  <string name="pref_camera_coloreffect_entry_posterize">Posterise</string>
+  <string name="pref_camera_coloreffect_entry_aqua">Aqua</string>
+  <string name="pref_camera_coloreffect_entry_emboss">Emboss</string>
+  <string name="pref_camera_coloreffect_entry_sketch">Sketch</string>
+  <string name="pref_camera_coloreffect_entry_neon">Neon</string>
+  <string name="pref_camera_coloreffect_entry_pastel">Pastel</string>
+  <string name="pref_camera_coloreffect_entry_mosaic">Mosaic</string>
+  <string name="pref_camera_coloreffect_entry_redtint">Red tint</string>
+  <string name="pref_camera_coloreffect_entry_bluetint">Blue tint</string>
+  <string name="pref_camera_coloreffect_entry_greentint">Green tint</string>
   <!-- Stabilization -->
+  <string name="pref_camera_dis_title">Stabilisation</string>
   <!-- Face recognition -->
+  <string name="pref_camera_facerc_title">Face recognition</string>
   <!-- Sharpness -->
+  <string name="pref_camera_sharpness_title">Sharpness</string>
+  <string name="pref_camera_sharpness_entry_level0">Level 0</string>
+  <string name="pref_camera_sharpness_entry_level1">Level 1</string>
+  <string name="pref_camera_sharpness_entry_level2">Level 2 (default)</string>
+  <string name="pref_camera_sharpness_entry_level3">Level 3</string>
+  <string name="pref_camera_sharpness_entry_level4">Level 4</string>
+  <string name="pref_camera_sharpness_entry_level5">Level 5</string>
+  <string name="pref_camera_sharpness_entry_level6">Level 6</string>
   <!-- Contrast -->
+  <string name="pref_camera_contrast_title">Contrast</string>
+  <string name="pref_camera_contrast_entry_level0">Level 0</string>
+  <string name="pref_camera_contrast_entry_level1">Level 1</string>
+  <string name="pref_camera_contrast_entry_level2">Level 2</string>
+  <string name="pref_camera_contrast_entry_level3">Level 3</string>
+  <string name="pref_camera_contrast_entry_level4">Level 4</string>
+  <string name="pref_camera_contrast_entry_level5">Level 5 (default)</string>
+  <string name="pref_camera_contrast_entry_level6">Level 6</string>
+  <string name="pref_camera_contrast_entry_level7">Level 7</string>
+  <string name="pref_camera_contrast_entry_level8">Level 8</string>
+  <string name="pref_camera_contrast_entry_level9">Level 9</string>
+  <string name="pref_camera_contrast_entry_level10">Level 10</string>
   <!-- Saturation -->
+  <string name="pref_camera_saturation_title">Saturation</string>
+  <string name="pref_camera_saturation_entry_level0">Level 0</string>
+  <string name="pref_camera_saturation_entry_level1">Level 1</string>
+  <string name="pref_camera_saturation_entry_level2">Level 2</string>
+  <string name="pref_camera_saturation_entry_level3">Level 3</string>
+  <string name="pref_camera_saturation_entry_level4">Level 4</string>
+  <string name="pref_camera_saturation_entry_level5">Level 5 (default)</string>
+  <string name="pref_camera_saturation_entry_level6">Level 6</string>
+  <string name="pref_camera_saturation_entry_level7">Level 7</string>
+  <string name="pref_camera_saturation_entry_level8">Level 8</string>
+  <string name="pref_camera_saturation_entry_level9">Level 9</string>
+  <string name="pref_camera_saturation_entry_level10">Level 10</string>
   <!-- Picture format -->
+  <string name="pref_camera_picture_format_title">Picture format</string>
   <!-- Picture quality -->
+  <string name="pref_camera_jpegquality_title">Picture quality</string>
+  <string name="pref_camera_jpegquality_entry_0">55%</string>
+  <string name="pref_camera_jpegquality_entry_1">65% (normal)</string>
+  <string name="pref_camera_jpegquality_entry_2">75% (fine)</string>
+  <string name="pref_camera_jpegquality_entry_3">85% (super fine)</string>
+  <string name="pref_camera_jpegquality_entry_4">95%</string>
+  <string name="pref_camera_jpegquality_entry_5">100%</string>
   <!-- Histogram -->
+  <string name="pref_camera_histogram_title">Histogram</string>
   <!-- Auto scene detection -->
+  <string name="pref_camera_scenedetect_title">Auto scene detection</string>
   <!-- Continuous shot -->
+  <string name="pref_camera_longshot_title">Continuous shot</string>
   <!-- Auto HDR -->
+  <string name="pref_camera_auto_hdr_title">Auto HDR</string>
   <!-- HDR mode -->
+  <string name="pref_camera_hdr_mode_title">HDR mode</string>
+  <string name="pref_camera_hdr_mode_entry_sensor">Sensor HDR</string>
+  <string name="pref_camera_hdr_mode_entry_multi_frame">Multi-frame HDR</string>
   <!-- HDR needs 1x frame -->
+  <string name="pref_camera_hdr_need_1x_title">HDR needs 1x frame</string>
   <!-- Video rotation -->
+  <string name="pref_camera_video_rotation_title">Video rotation</string>
+  <string name="pref_camera_video_rotation_entry_0">0 degrees</string>
+  <string name="pref_camera_video_rotation_entry_90">90 degrees</string>
+  <string name="pref_camera_video_rotation_entry_180">180 degrees</string>
+  <string name="pref_camera_video_rotation_entry_270">270 degrees</string>
   <!-- Storage location -->
+  <string name="pref_camera_savepath_title">Storage location</string>
+  <string name="pref_camera_savepath_entry_0">Internal storage</string>
+  <string name="pref_camera_savepath_entry_1">SD card</string>
   <!-- Misc -->
   <!-- The alias of CameraActivity for gesture operation -->
+  <string name="camera_gesture_title">Launch camera</string>
+  <string name="all_in_focus">All in focus</string>
+  <string name="refocus_toast">To re-focus last photo, tap here</string>
   <!-- Toast messages -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for High-framerate recording mode -->
+  <string name="error_app_unsupported_hfr_selection">High-framerate recording is not supported when using Stabilisation/Time lapse/HDR.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for Slow motion mode -->
+  <string name="error_app_unsupported_hfr">Slow motion mode is not supported for the selected video size. Select a lower video size</string>
   <!-- The message is shown in toast when the app encounters an unsupported resolution for Stabilization mode -->
+  <string name="error_app_unsupported_dis">Stabilisation is not supported for the selected video size. Select a lower video size</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for High speed mode -->
+  <string name="error_app_unsupported_hsr">High speed mode is not supported for the selected video size. Select a lower video size</string>
   <!-- The message is shown in dialog when the app encounters an unsupported video codec for HFR mode -->
+  <string name="error_app_unsupported_hfr_codec">Only H264 video encoding is supported when HFR is ON</string>
   <!-- The message is shown in dialog when the app encounters an unsupported video resolution-->
+  <string name="error_app_unsupported">Unsupported video resolution for this encoder type</string>
   <!--The message is shown in dialog when the raw snapshot is selected in Zero shutter lag mode-->
+  <string name="error_app_unsupported_raw">Raw picture format is not supported in Zero shutter lag mode. Select JPEG</string>
+  <string name="msg_cancel_longshot_for_limited_memory">Running out of memory, cancelling continuous shot</string>
   <!-- Toast showing non-supported functionality for flash in AE bracket -->
+  <string name="flash_aebracket_message">Flash is not supported in AE bracketing mode</string>
   <!-- toast message for storage location switch -->
+  <string name="on_switch_save_path_to_sdcard">Internal storage space is not enough, switched storage location to SD card</string>
   <!-- The message is shown in toast when click showOnMap Menu and there is no map app -->
+  <string name="map_activity_not_found_err">There is no maps app installed to show the location</string>
   <!-- Continous shot enable message -->
+  <string name="longshot_enable_message">Advanced features are not supported in continuous shot mode</string>
   <!-- Advance features enable message -->
+  <string name="advance_feature_enable_msg">Continuous shot is not supported when advanced features are enabled</string>
   <!-- Toast after enable HDR function to inform continuous shot has disabled -->
+  <string name="HDR_disable_continuous_shot">Enabling HDR will disable continuous shot</string>
   <!-- Toast after enable advanced capture function to inform continuous shot has disabled -->
+  <string name="advanced_capture_disable_continuous_shot">Enabling advanced capture will disable continuous shot</string>
   <!-- Toast after enable 2k4k video quality to inform IS has disabled -->
+  <string name="video_quality_4k_disable_IS">Enabling 4k video size will disable Stabilisation</string>
   <!-- Toast after 2k4k video is enabled to inform SeeMore has been disabled -->
+  <string name="video_quality_4k_disable_SeeMore">SeeMore cannot be enabled during 4k video</string>
   <!-- Toast after SeeMore has been enabled to show CDS is disabled -->
+  <string name="disable_CDS_during_SeeMore">Enabling SeeMore will disable CDS</string>
   <!-- Toast after SeeMore has been enabled to show TNR is disabled -->
+  <string name="disable_TNR_during_SeeMore">Enabling SeeMore will disable TNR</string>
   <!-- TODO: Remove these? -->
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index b9b98620d..774c49ee9 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -16,84 +16,177 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- The name of the Android Camera application. [CHAR LIMIT=16] -->
+  <string name="app_name">Camera</string>
   <!-- The label for the Video Camera activity. [CHAR LIMIT=16] -->
+  <string name="video_camera_label">Camcorder</string>
   <!-- Used to format short video duration in Details dialog. minutes:seconds e.g. 00:30 -->
+  <string name="details_ms">%1$02d:%2$02d</string>
   <!-- Used to format video duration in Details dialog. hours:minutes:seconds e.g. 0:21:30 -->
+  <string name="details_hms">%1$d:%2$02d:%3$02d</string>
   <!-- Displayed in the title of the dialog for things to do with a picture
              that is to be "set as" (e.g. set as contact photo or set as wallpaper) -->
+  <string name="set_image">Set picture as</string>
   <!-- Details dialog "OK" button. Dismisses dialog. -->
+  <string name="delete">Delete</string>
   <!-- String Delete the selected media item(s) [CHAR LIMIT=50] -->
+  <plurals name="delete_selection">
+    <item quantity="one">Delete selected item?</item>
+    <item quantity="other">Delete selected items?</item>
+  </plurals>
+  <string name="share">Share</string>
+  <string name="share_panorama">Share panorama</string>
+  <string name="share_as_photo">Share as photo</string>
   <!-- The label shown after an image is deleted [CHAR LIMIT=16] -->
+  <string name="deleted">Deleted</string>
   <!-- The label on the button which when clicked will undo a deletion of image [CHAR LIMIT=16]-->
+  <string name="undo">UNDO</string>
+  <string name="details">Details</string>
+  <string name="close">Close</string>
   <!-- String indicating how many media item(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
+  <plurals name="number_of_items_selected">
+    <item quantity="one">%1$d selected</item>
+    <item quantity="other">%1$d selected</item>
+  </plurals>
   <!-- String indicating how many media album(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
+  <plurals name="number_of_albums_selected">
+    <item quantity="one">%1$d selected</item>
+    <item quantity="other">%1$d selected</item>
+  </plurals>
   <!-- String indicating how many media group(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
+  <plurals name="number_of_groups_selected">
+    <item quantity="one">%1$d selected</item>
+    <item quantity="other">%1$d selected</item>
+  </plurals>
   <!-- String indicating timestamp of photo or video -->
+  <string name="show_on_map">Show on map</string>
+  <string name="rotate_left">Rotate left</string>
+  <string name="rotate_right">Rotate right</string>
   <!-- String used as a menu label. The user can choose to edit the image
          [CHAR_LIMIT=20]-->
+  <string name="edit">Edit</string>
   <!-- The title of the menu item to let user crop the image. [CHAR LIMIT=15] -->
+  <string name="crop_action">Crop</string>
   <!-- The title of the menu item to let user trim the video. [CHAR LIMIT=15] -->
+  <string name="trim_action">Trim</string>
   <!-- The title of the menu item to let user set the image as background etc. [CHAR LIMIT=15] -->
+  <string name="set_as">Set as</string>
   <!-- String indicating an error when playing the video. [CHAR LIMIT=30] -->
+  <string name="video_err">Can\'t play video.</string>
   <!-- Toast message shown when the cropped image has been saved in the
          %s folder (string: folder_download) [CHAR LIMIT=50]-->
+  <string name="crop_saved">
+        Cropped image saved to <xliff:g id="folder_name">%s</xliff:g>.</string>
   <!-- Text indicating the title of a media item in details window [CHAR LIMIT=14] -->
+  <string name="title">Title</string>
   <!-- Text indicating the description of a media item in details window [CHAR LIMIT=14] -->
+  <string name="description">Description</string>
   <!-- Text indicating the creation time of a media item in details window [CHAR LIMIT=14] -->
+  <string name="time">Time</string>
   <!-- Text indicating the location of a media item in details window [CHAR LIMIT=14] -->
+  <string name="location">Location</string>
   <!-- Text indicating the path of a media item in details window [CHAR LIMIT=14] -->
+  <string name="path">Path</string>
   <!-- Text indicating the width of a media item in details window [CHAR LIMIT=14] -->
+  <string name="width">Width</string>
   <!-- Text indicating the height of a media item in details window [CHAR LIMIT=14] -->
+  <string name="height">Height</string>
   <!-- Text indicating the orientation of a media item in details window [CHAR LIMIT=14] -->
+  <string name="orientation">Orientation</string>
   <!-- Text indicating the duration of a video item in details window [CHAR LIMIT=18] -->
+  <string name="duration">Duration</string>
   <!-- Text indicating the mime type of a media item in details window [CHAR LIMIT=14] -->
+  <string name="mimetype">MIME type</string>
   <!-- Text indicating the file size of a media item in details window [CHAR LIMIT=14] -->
+  <string name="file_size">File size</string>
   <!-- Text indicating the maker of a media item in details window [CHAR LIMIT=14] -->
+  <string name="maker">Maker</string>
   <!-- Text indicating the model of a media item in details window [CHAR LIMIT=14] -->
+  <string name="model">Model</string>
   <!-- Text indicating flash info of a media item in details window [CHAR LIMIT=14] -->
+  <string name="flash">Flash</string>
   <!-- Text indicating aperture of a media item in details window [CHAR LIMIT=14] -->
+  <string name="aperture">Aperture</string>
   <!-- Text indicating the focal length of a media item in details window [CHAR LIMIT=14] -->
+  <string name="focal_length">Focal Length</string>
   <!-- Text indicating the white balance of a media item in details window [CHAR LIMIT=18] -->
+  <string name="white_balance">White balance</string>
   <!-- Text indicating the exposure time of a media item in details window [CHAR LIMIT=14] -->
+  <string name="exposure_time">Exposure time</string>
   <!-- Text indicating the ISO speed rating of a media item in details window [CHAR LIMIT=14] -->
+  <string name="iso">ISO</string>
   <!-- String indicating the time units in seconds. [CHAR LIMIT=8] -->
   <!-- String indicating the length units in milli-meters. [CHAR LIMIT=8] -->
+  <string name="unit_mm">mm</string>
   <!-- String indicating how camera shooting feature is used. [CHAR LIMIT=12] -->
+  <string name="manual">Manual</string>
   <!-- String indicating how camera shooting feature is used. [CHAR LIMIT=12 -->
+  <string name="auto">Auto</string>
   <!-- String indicating camera flash is fired. [CHAR LIMIT=14] -->
+  <string name="flash_on">Flash fired</string>
   <!-- String indicating camera flash is not used. [CHAR LIMIT=14] -->
+  <string name="flash_off">No flash</string>
   <!-- String indicating image width or height is unknown. [CHAR LIMIT=14] -->
+  <string name="unknown">Unknown</string>
   <!-- Toast message shown after we try to make a local album available offline
          [CHAR LIMIT=150] -->
+  <string name="try_to_set_local_album_available_offline">
+        This item is stored locally and available offline.</string>
   <!-- The content of a dialog showing trimming in progress. [CHAR LIMIT=30] -->
+  <string name="please_wait">Please wait</string>
   <!-- Text to show with progress bar while stitching a photo sphere. 'Photo sphere' is a product name. [CHAR LIMIT=35]-->
+  <string name="rendering_photo_sphere">Rendering photo sphere</string>
   <!-- title for the dialog showing the error of camera hardware -->
+  <string name="camera_error_title">Camera error</string>
   <!-- message for the dialog showing the error of camera hardware -->
+  <string name="cannot_connect_camera">Can\'t connect to the camera.</string>
   <!-- message for the dialog showing the camera is disabled because of security policies. Camera cannot be used. -->
+  <string name="camera_disabled">Camera has been disabled because of security policies.</string>
   <!-- message for the dialog showing that the app does not have sufficient permissions [CHAR LIMIT=NONE] -->
+  <string name="error_permissions">The app does not have critical permissions needed to run. Please check your permissions settings.</string>
   <!-- Dialog "Dismiss" button. Closes the dialog [CHAR LIMIT=12]-->
+  <string name="dialog_dismiss">Dismiss</string>
   <!-- alert to the user to wait for some operation to complete -->
+  <string name="wait">Please wait\u2026</string>
   <!-- alert to the user that an SD card must be installed before using the camera -->
+  <string name="no_storage" product="default">Insert an SD card before using the camera.</string>
   <!-- alert to the user that the SD card is being disk-checked -->
+  <string name="preparing_sd" product="default">Preparing SD card\u2026</string>
   <!-- alert to the user that the camera fails to read or write the SD card. -->
+  <string name="access_sd_fail" product="default">Couldn\'t access SD card.</string>
   <!-- A label that overlays on top of the preview frame to indicate the camcorder is in time lapse mode [CHAR LIMIT=35] -->
+  <string name="time_lapse_title">Time lapse recording</string>
   <!-- Screen display message during image capture to indicate that the capture is in progress, like during HDR+. [CHAR LIMIT=20] -->
+  <string name="capturing">Capturing</string>
   <!-- Settings screen, camera selection dialog title. Users can select a camera from the phone (front-facing or back-facing). [CHAR LIMIT=20] -->
+  <string name="pref_camera_id_title">Choose camera</string>
   <!-- In select camera setting, back facing camera. [CHAR LIMIT=14] -->
+  <string name="pref_camera_id_entry_back">Back</string>
   <!-- In select camera setting, front-facing camera. [CHAR LIMIT=14] -->
+  <string name="pref_camera_id_entry_front">Front</string>
   <!-- Settings screen, setting title text -->
+  <string name="pref_camera_recordlocation_title">Store location</string>
   <!--  Label for record location preference [CHAR LIMIT=50] -->
+  <string name="pref_camera_location_label">LOCATION</string>
   <!-- Title for countdown timer on camera settings screen [CHAR LIMIT=30]-->
+  <string name="pref_camera_timer_title">Countdown timer</string>
   <!-- Entry for countdown timer setting. e.g. 1 second, 10 seconds, etc. [CHAR LIMIT=30]-->
+  <plurals name="pref_camera_timer_entry">
+    <item quantity="one">1 second</item>
+    <item quantity="other">%d seconds</item>
+  </plurals>
   <!-- Text followed by a checkbox to turn on/off sound effects during the countdown. [CHAR LIMIT = 24]-->
+  <string name="pref_camera_timer_sound_title">Beep during countdown</string>
   <!-- Entry of a on/off setting. The setting is turned off. [CHAR LIMIT=15] -->
+  <string name="setting_off">Off</string>
   <!-- Entry of a on/off setting. The setting is turned on. [CHAR LIMIT=15] -->
+  <string name="setting_on">On</string>
   <!-- The value of a camera preference indicating the setting is off. -->
   <!-- The value of a camera preference indicating the setting is on. -->
   <!-- The Video quality settings in preference [CHAR LIMIT=21] -->
+  <string name="pref_video_quality_title">Video quality</string>
   <!-- The default quality value is NULL -->
   <!-- Video quality setting entry.
     Videos will be recorded in 4k DCI quality. [CHAR LIMIT=24] -->
@@ -104,170 +197,334 @@
   <!-- Video quality setting entry. Videos will be recorded in 480p quality. [CHAR LIMIT=24] -->
   <!-- Describes the preference dialog for choosing interval between frame capture for
     time lapse recording. Appears at top of the dialog. [CHAR LIMIT=30] -->
+  <string name="pref_video_time_lapse_frame_interval_title">Time lapse</string>
   <!-- Settings screen, Camera setting category title -->
+  <string name="pref_camera_settings_category">Camera settings</string>
   <!-- Settings screen, Camcorder setting category title -->
+  <string name="pref_camcorder_settings_category">Camcorder settings</string>
   <!-- Settings screen, Picture size title -->
+  <string name="pref_camera_picturesize_title">Picture size</string>
   <!-- Settings screen, Focus mode title -->
+  <string name="pref_camera_focusmode_title">Focus mode</string>
   <!-- Settings screen, Focus mode dialog radio button choices -->
+  <string name="pref_camera_focusmode_entry_auto">Auto</string>
   <!-- A setting that lets the camera focus into infinity. [CHAR LIMIT=20] -->
+  <string name="pref_camera_focusmode_entry_infinity">Infinity</string>
   <!-- A setting that lets the camera operate in macro focus mode for nearby objects. [CHAR LIMIT=20] -->
+  <string name="pref_camera_focusmode_entry_macro">Macro</string>
   <!-- Menu, focus mode labels [CHAR LIMIT=50] -->
+  <string name="pref_camera_focusmode_label_auto">AUTO</string>
+  <string name="pref_camera_focusmode_label_infinity">INFINITY</string>
+  <string name="pref_camera_focusmode_label_macro">MACRO</string>
   <!-- Default flash mode setting.-->
   <!-- Value for flash off setting-->
   <!-- Settings screen, Flash mode title -->
+  <string name="pref_camera_flashmode_title">Flash mode</string>
   <!-- flash label [CHAR LIMIT=50] -->
+  <string name="pref_camera_flashmode_label">FLASH MODE</string>
   <!-- Settings screen, Flash mode 'auto'. [CHAR LIMIT=12] -->
+  <string name="pref_camera_flashmode_entry_auto">Auto</string>
   <!-- Settings screen, Flash mode 'alway on'. [CHAR LIMIT=12] -->
+  <string name="pref_camera_flashmode_entry_on">On</string>
   <!-- Settings screen, Flash mode 'always off'. [CHAR LIMIT=12] -->
+  <string name="pref_camera_flashmode_entry_off">Off</string>
   <!-- Menu, flash mode labels [CHAR LIMIT=50] -->
+  <string name="pref_camera_flashmode_label_auto">FLASH AUTO</string>
+  <string name="pref_camera_flashmode_label_on">FLASH ON</string>
+  <string name="pref_camera_flashmode_label_off">FLASH OFF</string>
   <!-- Default videocamera flash mode setting.-->
   <!-- Default white balance setting. -->
   <!-- Settings screen, white balance title -->
+  <string name="pref_camera_whitebalance_title">White balance</string>
   <!-- Menu, white balance label -->
+  <string name="pref_camera_whitebalance_label">WHITE BALANCE</string>
   <!-- Settings screen, White balance dialog radio button choices -->
+  <string name="pref_camera_whitebalance_entry_auto">Auto</string>
+  <string name="pref_camera_whitebalance_entry_incandescent">Incandescent</string>
+  <string name="pref_camera_whitebalance_entry_daylight">Daylight</string>
+  <string name="pref_camera_whitebalance_entry_fluorescent">Fluorescent</string>
+  <string name="pref_camera_whitebalance_entry_cloudy">Cloudy</string>
   <!-- Menu, White balance labels [CHAR LIMIT=50] -->
+  <string name="pref_camera_whitebalance_label_auto">AUTO</string>
+  <string name="pref_camera_whitebalance_label_incandescent">INCANDESCENT</string>
+  <string name="pref_camera_whitebalance_label_daylight">DAYLIGHT</string>
+  <string name="pref_camera_whitebalance_label_fluorescent">FLUORESCENT</string>
+  <string name="pref_camera_whitebalance_label_cloudy">CLOUDY</string>
   <!-- Default scene mode setting. -->
   <!-- Settings screen, Select Scene mode -->
+  <string name="pref_camera_scenemode_title">Scene mode</string>
   <!-- Settings menu, scene mode choices [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_auto">Auto</string>
   <!-- Scene mode that uses HDR plus (better HDR) [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_hdr_plus">HDR+</string>
   <!-- Scene mode that uses HDR (high dynamic range) [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_hdr">HDR</string>
   <!-- Scene mode to turn on HDR (better high dynamic range) [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_entry_turn_hdr_plus_on">HDR+ ON</string>
   <!-- Scene mode to turn off HDR (better high dynamic range) [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_entry_turn_hdr_plus_off">HDR+ OFF</string>
   <!-- Scene mode to turn on HDR (high dynamic range) [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_entry_turn_hdr_on">HDR ON</string>
   <!-- Scene mode to turn off HDR (high dynamic range) [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_entry_turn_hdr_off">HDR OFF</string>
   <!-- Scene mode that takes an image quickly with little motion blur. [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_action">Action</string>
   <!-- Scene mode that takes long exposures to capture night scenes without flash. [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_night">Night</string>
   <!-- Scene mode optimized for taking images in the sunset. [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_sunset">Sunset</string>
   <!-- Scene mode optimized for taking indoor low-lights pictures. [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_party">Party</string>
   <!-- Settings menu, scene mode labels [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_label_auto">NONE</string>
   <!-- Scene mode that takes an image quickly with little motion blur. [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_label_action">ACTION</string>
   <!-- Scene mode that takes long exposures to capture night scenes without flash. [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_label_night">NIGHT</string>
   <!-- Scene mode optimized for taking images in the sunset. [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_label_sunset">SUNSET</string>
   <!-- Scene mode optimized for taking indoor low-lights pictures. [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_label_party">PARTY</string>
   <!-- Settings menu countdown timer off [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_off">TIMER OFF</string>
   <!-- Settings menu countdown timer 1 second [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_one">1 SECOND</string>
   <!-- Settings menu countdown timer 3 seconds [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_three">3 SECONDS</string>
   <!-- Settings menu countdown timer 10 seconds [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_ten">10 SECONDS</string>
   <!-- Settings menu countdown timer 15 seconds [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_fifteen">15 SECONDS</string>
   <!-- Toast after trying to select a setting that is not allowed to change in scene mode [CHAR LIMIT=NONE] -->
+  <string name="not_selectable_in_scene_mode">Not selectable in scene mode.</string>
   <!-- Exposure settings in preference -->
+  <string name="pref_exposure_title">Exposure</string>
   <!--  menu label exposure compensation [CHAR LIMIT=50] -->
+  <string name="pref_exposure_label">EXPOSURE</string>
   <!-- Default HDR entry value -->
   <!-- Default HDR+ entry value -->
   <!-- HDR label ON [CHAR LIMIT=60] -->
+  <string name="pref_camera_hdr_label">HDR</string>
   <!-- switch camera label back [CHAR LIMIT=60] -->
+  <string name="pref_camera_id_label_back">FRONT CAMERA</string>
   <!-- switch camera label front [CHAR LIMIT=60] -->
+  <string name="pref_camera_id_label_front">BACK CAMERA</string>
   <!-- Dialog "OK" button. Dismisses dialog. -->
+  <string name="dialog_ok">OK</string>
   <!-- Low-memory dialog message [CHAR LIMIT=NONE] -->
+  <string name="spaceIsLow_content" product="default">Your SD card is running out of space. Change the quality setting or delete some images or other files.</string>
   <!-- Camera format string for new image files. Passed to java.text.SimpleDateFormat. -->
   <!-- Video Camera format string for new video files. Passed to java.text.SimpleDateFormat. -->
   <!-- Filename prefix for panorama output. -->
   <!-- The message shown when video record reaches size limit. -->
+  <string name="video_reach_size_limit">Size limit reached.</string>
   <!-- The text shown when the panorama panning speed is to fast [CHAR LIMIT=16] -->
+  <string name="pano_too_fast_prompt">Too fast</string>
   <!-- The text shown in the progress dialog when panorama preview is generating in the background [CHAR LIMIT=30] -->
+  <string name="pano_dialog_prepare_preview">Preparing panorama</string>
   <!-- The text shown in the dialog when panorama saving failed [CHAR LIMIT=40] -->
+  <string name="pano_dialog_panorama_failed">Couldn\'t save panorama.</string>
   <!-- The text shown on the dialog title in the dialogs for Panorama [CHAR LIMIT=12] -->
+  <string name="pano_dialog_title">Panorama</string>
   <!-- The text shown on the top-left corner of the screen to indicate the capturing is on going [CHAR LIMIT=27] -->
+  <string name="pano_capture_indication">Capturing panorama</string>
   <!-- The text shown in the progress dialog when waiting for previous panorama finishing [CHAR LIMIT=40] -->
+  <string name="pano_dialog_waiting_previous">Waiting for previous panorama</string>
   <!-- The text shown on the bottom-left corner of the screen to indicate that the saving is in process [CHAR LIMIT=13] -->
+  <string name="pano_review_saving_indication_str">Saving\u2026</string>
   <!-- The text shown on the screen to indicate that the panorama is rendering [CHAR LIMIT=27] -->
+  <string name="pano_review_rendering">Rendering panorama</string>
   <!-- Toast telling users tapping on the viewfinder will trigger autofocus [CHAR LIMIT=28] -->
+  <string name="tap_to_focus">Touch to focus.</string>
   <!-- Default effect setting that clears the effect. -->
   <!-- Title of video effect setting popup window -->
+  <string name="pref_video_effect_title">Effects</string>
   <!-- Effect setting item that clear the effect. [CHAR LIMIT=14] -->
+  <string name="effect_none">None</string>
   <!-- Effect setting item that squeezes the face. [CHAR LIMIT=14] -->
+  <string name="effect_goofy_face_squeeze">Squeeze</string>
   <!-- Effect setting item that makes eyes big. [CHAR LIMIT=14] -->
+  <string name="effect_goofy_face_big_eyes">Big eyes</string>
   <!-- Effect setting item that makes mouth big. [CHAR LIMIT=14] -->
+  <string name="effect_goofy_face_big_mouth">Big mouth</string>
   <!-- Effect setting item that makes mouth small. [CHAR LIMIT=14] -->
+  <string name="effect_goofy_face_small_mouth">Small mouth</string>
   <!-- Effect setting item that makes nose big. [CHAR LIMIT=14] -->
+  <string name="effect_goofy_face_big_nose">Big nose</string>
   <!-- Effect setting item that makes eyes small. [CHAR LIMIT=14] -->
+  <string name="effect_goofy_face_small_eyes">Small eyes</string>
   <!-- Effect setting item that replaces background with Android in Space. [CHAR LIMIT=14] -->
+  <string name="effect_backdropper_space">In space</string>
   <!-- Effect setting item that replaces background with a sunset. [CHAR LIMIT=14] -->
+  <string name="effect_backdropper_sunset">Sunset</string>
   <!-- Effect setting item that replaces background with video from gallery. [CHAR LIMIT=14] -->
+  <string name="effect_backdropper_gallery">Your video</string>
   <!-- Toast telling users tapping on the viewfinder will take a picture [CHAR LIMIT=54] -->
+  <string name="video_snapshot_hint">Touch to take photo while recording.</string>
   <!-- Announcement telling users video recording has just started [CHAR LIMIT=NONE] -->
+  <string name="video_recording_started">Video recording has started.</string>
   <!-- Announcement telling users video recording has just stopped [CHAR LIMIT=NONE] -->
+  <string name="video_recording_stopped">Video recording has stopped.</string>
   <!-- A button in effect setting popup to clear the effect. [CHAR LIMIT=26] -->
+  <string name="clear_effects">Clear effects</string>
   <!-- Title of category for silly face effects. [CHAR LIMIT=26] -->
+  <string name="effect_silly_faces">SILLY FACES</string>
   <!-- Title of category for background replacement effects. [CHAR LIMIT=26] -->
+  <string name="effect_background">BACKGROUND</string>
   <!-- The shutter button. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_shutter_button">Shutter</string>
   <!-- The menu button. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_menu_button">Menu button</string>
   <!-- The mode picker to switch between camera, video and panorama. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_mode_picker">Camera, video or panorama selector</string>
   <!-- The check box in camera settings, such as store location. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_check_box">%1$s tick box</string>
   <!-- The button to switch to Camera mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_camera">Switch to photo</string>
   <!-- The button to switch to Video mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_video">Switch to video</string>
   <!-- The button to switch to Panorama mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_panorama">Switch to panorama</string>
   <!-- The button to switch to the Photo Sphere mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_photo_sphere">Switch to Photo Sphere</string>
   <!-- The button to switch to the high quality mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_gcam">Switch to high quality</string>
   <!-- The button in review mode indicating that the photo taking, video recording, and panorama saving session should be canceled [CHAR LIMIT = NONE] -->
+  <string name="accessibility_review_cancel">Review cancel</string>
   <!-- The button in review mode indicating that the taken photo/video is OK to be attached/uploaded [CHAR LIMIT = NONE] -->
+  <string name="accessibility_review_ok">Review done</string>
   <!-- button in review mode indicate the user want to retake another photo/video for attachment [
 CHAR LIMIT = NONE] -->
+  <string name="accessibility_review_retake">Review retake</string>
   <!-- Default text for a button that can be toggled on and off. -->
+  <string name="capital_on">ON</string>
   <!-- Default text for a button that can be toggled on and off. -->
+  <string name="capital_off">OFF</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_off">Off</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_500">0.5 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_1000">1 second</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_1500">1.5 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_2000">2 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_2500">2.5 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_3000">3 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_4000">4 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_5000">5 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_6000">6 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_10000">10 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_12000">12 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_15000">15 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_24000">24 seconds</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_30000">0.5 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_60000">1 minute</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_90000">1.5 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_120000">2 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_150000">2.5 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_180000">3 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_240000">4 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_300000">5 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_360000">6 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_600000">10 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_720000">12 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_900000">15 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_1440000">24 minutes</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_1800000">0.5 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_3600000">1 hour</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_5400000">1.5 hour</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_7200000">2 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_9000000">2.5 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_10800000">3 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_14400000">4 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_18000000">5 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_21600000">6 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_36000000">10 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_43200000">12 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_54000000">15 hours</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_86400000">24 hours</string>
   <!-- Seconds: a unit of time for time lapse intervals. [CHAR LIMIT = 20] -->
+  <string name="time_lapse_seconds">seconds</string>
   <!-- Minutes: a unit of time for time lapse intervals. [CHAR LIMIT = 20] -->
+  <string name="time_lapse_minutes">minutes</string>
   <!-- Hours: a unit of time for time lapse intervals. [CHAR LIMIT = 20] -->
+  <string name="time_lapse_hours">hours</string>
   <!-- The button to confirm time-lapse setting changes. [CHAR LIMIT = 20] -->
+  <string name="time_lapse_interval_set">Done</string>
   <!-- Title in time interval picker for setting time interval. [CHAR LIMIT = 30]-->
+  <string name="set_time_interval">Set Time Interval</string>
   <!-- Help text that is shown when the time lapse feature is turned off. [CHAR LIMIT = 180]-->
+  <string name="set_time_interval_help">Time lapse feature is off. Turn it on to set time interval.</string>
   <!-- Title in timer setting for setting the duration for the countdown timer. [CHAR LIMIT = 50]-->
+  <string name="set_duration">Set duration in seconds</string>
   <!-- On-screen hint during timer countdown for taking a photo. [CHAR LIMIT = 60]-->
+  <string name="count_down_title_text">Counting down to take a photo</string>
   <!-- Title for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 50] -->
+  <string name="remember_location_title">Remember photo locations?</string>
   <!-- Message for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = None] -->
+  <string name="remember_location_prompt">Tag your photos and videos with the locations where they are taken.\n\nOther apps can access this information along with your saved images.</string>
   <!-- Negative answer for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 20] -->
+  <string name="remember_location_no">No, thanks</string>
   <!-- Positive answer for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 20] -->
+  <string name="remember_location_yes">Yes</string>
   <!-- Camera menu labels -->
   <!-- more options label [CHAR LIMIT=50] -->
+  <string name="camera_menu_more_label">MORE OPTIONS</string>
   <!-- settings label [CHAR LIMIT=50] -->
+  <string name="camera_menu_settings_label">SETTINGS</string>
   <!--  Tiny Planet -->
   <!-- Button to press for creating a tiny planet image. [CHAR LIMIT = 30] -->
+  <string name="create_tiny_planet">Create Tiny Planet</string>
   <!-- Message shown while a tiny planet image is being saved. [CHAR LIMIT = 30] -->
+  <string name="saving_tiny_planet">Saving Tiny Planet&#8230;</string>
   <!-- Label above a slider that let's the user set the zoom of a tiny planet image. [CHAR LIMIT = 15] -->
+  <string name="tiny_planet_zoom">Zoom</string>
   <!-- Label above a slider that let's the user set the rotation of a tiny planet image. [CHAR LIMIT = 15] -->
+  <string name="tiny_planet_rotate">Rotate</string>
   <!-- Crop -->
   <!-- Label for the save button in the crop activity action bar [CHAR LIMIT=20] -->
+  <string name="crop_save">Save</string>
   <!--  String shown when we cannot load the image when starting the activity [CHAR LIMIT=NONE] -->
+  <string name="cannot_load_image">Cannot load the image!</string>
   <!-- Label for album filmstrip button -->
+  <string name="switch_photo_filmstrip">Filmstrip view</string>
   <!--  String shown when setting the homepage wallpaper in the background [CHAR LIMIT=NONE] -->
+  <string name="setting_wallpaper">Setting wallpaper</string>
 </resources>
diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml
index d3e216d7d..9d62e9370 100644
--- a/res/values-es-rUS/cm_strings.xml
+++ b/res/values-es-rUS/cm_strings.xml
@@ -95,10 +95,10 @@
   <string name="pref_camera_max_brightness_title">Pantalla brillante</string>
   <!-- Touch focus duration -->
   <string name="pref_camera_focustime_title">Duración del enfoque</string>
-  <string name="pref_camera_focustime_entry_0">0s</string>
-  <string name="pref_camera_focustime_entry_3">3s</string>
-  <string name="pref_camera_focustime_entry_5">5 segundos</string>
-  <string name="pref_camera_focustime_entry_10">10 segundos</string>
+  <string name="pref_camera_focustime_entry_0">0 seg.</string>
+  <string name="pref_camera_focustime_entry_3">3 seg.</string>
+  <string name="pref_camera_focustime_entry_5">5 seg.</string>
+  <string name="pref_camera_focustime_entry_10">10 seg.</string>
   <string name="pref_camera_focustime_entry_infinite">Infinito</string>
   <!-- Shutter speed -->
   <string name="pref_camera_shutter_speed_title">Velocidad de obturación</string>
diff --git a/res/values-es-rUS/qcomstrings.xml b/res/values-es-rUS/qcomstrings.xml
index f84d681d4..c26acb5ee 100644
--- a/res/values-es-rUS/qcomstrings.xml
+++ b/res/values-es-rUS/qcomstrings.xml
@@ -38,7 +38,7 @@
   <!-- Skin tone enhancement -->
   <string name="pref_camera_skinToneEnhancement_title">Mejora tono de piel</string>
   <!-- Zero shutter lag-->
-  <string name="pref_camera_zsl_title">Eliminar retraso del disparador</string>
+  <string name="pref_camera_zsl_title">Desactivar retraso del disparador</string>
   <!-- Autofocus zone -->
   <string name="pref_camera_selectablezoneaf_title">Zona de enfoque automático</string>
   <string name="pref_camera_selectablezoneaf_entry_auto">Automático</string>
@@ -161,7 +161,7 @@
   <string name="pref_camera_sharpness_title">Nitidez</string>
   <string name="pref_camera_sharpness_entry_level0">Nivel 0</string>
   <string name="pref_camera_sharpness_entry_level1">Nivel 1</string>
-  <string name="pref_camera_sharpness_entry_level2">Nivel 2 (predeterminado)</string>
+  <string name="pref_camera_sharpness_entry_level2">Nivel 2 (predefinido)</string>
   <string name="pref_camera_sharpness_entry_level3">Nivel 3</string>
   <string name="pref_camera_sharpness_entry_level4">Nivel 4</string>
   <string name="pref_camera_sharpness_entry_level5">Nivel 5</string>
@@ -173,7 +173,7 @@
   <string name="pref_camera_contrast_entry_level2">Nivel 2</string>
   <string name="pref_camera_contrast_entry_level3">Nivel 3</string>
   <string name="pref_camera_contrast_entry_level4">Nivel 4</string>
-  <string name="pref_camera_contrast_entry_level5">Nivel 2 (predeterminado)</string>
+  <string name="pref_camera_contrast_entry_level5">Nivel 2 (predefinido)</string>
   <string name="pref_camera_contrast_entry_level6">Nivel 6</string>
   <string name="pref_camera_contrast_entry_level7">Nivel 7</string>
   <string name="pref_camera_contrast_entry_level8">Nivel 8</string>
@@ -186,7 +186,7 @@
   <string name="pref_camera_saturation_entry_level2">Nivel 2</string>
   <string name="pref_camera_saturation_entry_level3">Nivel 3</string>
   <string name="pref_camera_saturation_entry_level4">Nivel 4</string>
-  <string name="pref_camera_saturation_entry_level5">Nivel 2 (predeterminado)</string>
+  <string name="pref_camera_saturation_entry_level5">Nivel 2 (predefinido)</string>
   <string name="pref_camera_saturation_entry_level6">Nivel 6</string>
   <string name="pref_camera_saturation_entry_level7">Nivel 7</string>
   <string name="pref_camera_saturation_entry_level8">Nivel 8</string>
@@ -252,7 +252,7 @@
   <!-- toast message for storage location switch -->
   <string name="on_switch_save_path_to_sdcard">El espacio de almacenamiento interno no es suficiente, cambiar la ubicación de almacenamiento a tarjeta SD</string>
   <!-- The message is shown in toast when click showOnMap Menu and there is no map app -->
-  <string name="map_activity_not_found_err">No hay ninguna aplicación de mapas instalada para mostrar la ubicación</string>
+  <string name="map_activity_not_found_err">Sin aplicación de mapas instalada para mostrar la ubicación</string>
   <!-- Continous shot enable message -->
   <string name="longshot_enable_message">Las características avanzadas no son compatibles en modo de disparo continuo</string>
   <!-- Advance features enable message -->
@@ -260,9 +260,9 @@
   <!-- Toast after enable HDR function to inform continuous shot has disabled -->
   <string name="HDR_disable_continuous_shot">Activar HDR desactivará el disparo continuo</string>
   <!-- Toast after enable advanced capture function to inform continuous shot has disabled -->
-  <string name="advanced_capture_disable_continuous_shot">La habilitación de captura avanzada desactivará el disparo continuo</string>
+  <string name="advanced_capture_disable_continuous_shot">Activar la captura avanzada desactivará el disparo continuo</string>
   <!-- Toast after enable 2k4k video quality to inform IS has disabled -->
-  <string name="video_quality_4k_disable_IS">Habilitar el tamaño de video en 4k desactivará la estabilización</string>
+  <string name="video_quality_4k_disable_IS">Activar el tamaño de video 4k desactivará la estabilización</string>
   <!-- Toast after 2k4k video is enabled to inform SeeMore has been disabled -->
   <string name="video_quality_4k_disable_SeeMore">SeeMore no puede activarse si está activado el 4k</string>
   <!-- Toast after SeeMore has been enabled to show CDS is disabled -->
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index bdc877169..c09e60c9b 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -27,11 +27,11 @@
              that is to be "set as" (e.g. set as contact photo or set as wallpaper) -->
   <string name="set_image">Establecer imagen como</string>
   <!-- Details dialog "OK" button. Dismisses dialog. -->
-  <string name="delete">Eliminar</string>
+  <string name="delete">Borrar</string>
   <!-- String Delete the selected media item(s) [CHAR LIMIT=50] -->
   <plurals name="delete_selection">
-    <item quantity="one">¿Eliminar elemento?</item>
-    <item quantity="other">¿Eliminar elementos?</item>
+    <item quantity="one">¿Borrar elemento?</item>
+    <item quantity="other">¿Borrar elementos?</item>
   </plurals>
   <string name="share">Compartir</string>
   <string name="share_panorama">Compartir foto panorámica</string>
@@ -142,7 +142,7 @@ La imagen recortada se guardó en <xliff:g id="folder_name">%s</xliff:g>.</strin
   <!-- message for the dialog showing the error of camera hardware -->
   <string name="cannot_connect_camera">No se puede establecer conexión con la cámara.</string>
   <!-- message for the dialog showing the camera is disabled because of security policies. Camera cannot be used. -->
-  <string name="camera_disabled">Se inhabilitó la cámara por políticas de seguridad.</string>
+  <string name="camera_disabled">Se desactivó la cámara por políticas de seguridad.</string>
   <!-- message for the dialog showing that the app does not have sufficient permissions [CHAR LIMIT=NONE] -->
   <string name="error_permissions">La aplicación no tiene los permisos críticos necesarios para funcionar. Comprueba los ajustes de los permisos.</string>
   <!-- Dialog "Dismiss" button. Closes the dialog [CHAR LIMIT=12]-->
@@ -365,7 +365,7 @@ La imagen recortada se guardó en <xliff:g id="folder_name">%s</xliff:g>.</strin
   <!-- Announcement telling users video recording has just stopped [CHAR LIMIT=NONE] -->
   <string name="video_recording_stopped">Se detuvo la grabación de video.</string>
   <!-- A button in effect setting popup to clear the effect. [CHAR LIMIT=26] -->
-  <string name="clear_effects">Eliminar efectos</string>
+  <string name="clear_effects">Limpiar efectos</string>
   <!-- Title of category for silly face effects. [CHAR LIMIT=26] -->
   <string name="effect_silly_faces">CARAS GRACIOSAS</string>
   <!-- Title of category for background replacement effects. [CHAR LIMIT=26] -->
@@ -498,7 +498,7 @@ CHAR LIMIT = NONE] -->
   <!-- Title for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 50] -->
   <string name="remember_location_title">¿Recordar ubicaciones de las fotos?</string>
   <!-- Message for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = None] -->
-  <string name="remember_location_prompt">Agrega una etiqueta a tus fotos y videos con la ubicación donde se tomaron.\n\nOtras aplicaciones pueden acceder a esta información junto con las imágenes guardadas.</string>
+  <string name="remember_location_prompt">Añade una etiqueta a tus fotos y videos con la ubicación donde se tomaron.\n\nOtras aplicaciones pueden acceder a esta información junto con las imágenes guardadas.</string>
   <!-- Negative answer for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 20] -->
   <string name="remember_location_no">No, gracias</string>
   <!-- Positive answer for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 20] -->
@@ -507,7 +507,7 @@ CHAR LIMIT = NONE] -->
   <!-- more options label [CHAR LIMIT=50] -->
   <string name="camera_menu_more_label">MÁS OPCIONES</string>
   <!-- settings label [CHAR LIMIT=50] -->
-  <string name="camera_menu_settings_label">CONFIGURACIÓN</string>
+  <string name="camera_menu_settings_label">AJUSTES</string>
   <!--  Tiny Planet -->
   <!-- Button to press for creating a tiny planet image. [CHAR LIMIT = 30] -->
   <string name="create_tiny_planet">Crear efecto miniplaneta</string>
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index 8d9ff9392..7d393a4e4 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/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> megapixel</string>
   <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">Makro+</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Desenfoke murriztailea</string>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index 8a813e9cc..54fe7f03e 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/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" exemple="16:9">%1$s</xliff:g>) <xliff:g id="pixels">%2$1.1f</xliff:g> megapixels</string>
   <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">Macro+</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Réduction du flou de mouvement</string>
diff --git a/res/values-fr/qcomstrings.xml b/res/values-fr/qcomstrings.xml
index b6adb48c1..7d408d9d2 100644
--- a/res/values-fr/qcomstrings.xml
+++ b/res/values-fr/qcomstrings.xml
@@ -266,6 +266,8 @@
   <!-- Toast after 2k4k video is enabled to inform SeeMore has been disabled -->
   <string name="video_quality_4k_disable_SeeMore">SeeMore n\'est pas activable pendant la vidéo 4k</string>
   <!-- Toast after SeeMore has been enabled to show CDS is disabled -->
+  <string name="disable_CDS_during_SeeMore">Activer SeeMore désactivera CDS</string>
   <!-- Toast after SeeMore has been enabled to show TNR is disabled -->
+  <string name="disable_TNR_during_SeeMore">Activer SeeMore désactivera TNR</string>
   <!-- TODO: Remove these? -->
 </resources>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index e8e4ef31f..b73a2cef6 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/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> megapixel</string>
   <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">Makró+</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Elmosódás csökkentés</string>
diff --git a/res/values-in/qcomstrings.xml b/res/values-in/qcomstrings.xml
index 907e79575..1ce00d75d 100644
--- a/res/values-in/qcomstrings.xml
+++ b/res/values-in/qcomstrings.xml
@@ -81,7 +81,7 @@
   <!-- Face detection -->
   <string name="pref_camera_facedetection_title">Deteksi wajah</string>
   <!-- Selfie Flash -->
-  <string name="pref_selfie_flash_title">Lampu kilat swafoto</string>
+  <string name="pref_selfie_flash_title">Lampu kilat selfie</string>
   <!-- Red eye reduction -->
   <string name="pref_camera_redeyereduction_title">Penurunan mata merah</string>
   <!-- AE bracketing -->
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index f89b7a185..25952ec9d 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -102,7 +102,7 @@ Gambar yang dipotong disimpan ke <xliff:g id="folder_name">%s</xliff:g>.</string
   <!-- Text indicating the model of a media item in details window [CHAR LIMIT=14] -->
   <string name="model">Model</string>
   <!-- Text indicating flash info of a media item in details window [CHAR LIMIT=14] -->
-  <string name="flash">Flash</string>
+  <string name="flash">Lampu kilat</string>
   <!-- Text indicating aperture of a media item in details window [CHAR LIMIT=14] -->
   <string name="aperture">Bukaan</string>
   <!-- Text indicating the focal length of a media item in details window [CHAR LIMIT=14] -->
@@ -224,7 +224,7 @@ Gambar yang dipotong disimpan ke <xliff:g id="folder_name">%s</xliff:g>.</string
   <string name="pref_camera_flashmode_entry_off">Tidak aktif</string>
   <!-- Menu, flash mode labels [CHAR LIMIT=50] -->
   <string name="pref_camera_flashmode_label_auto">LAMPU KILAT OTOMATIS</string>
-  <string name="pref_camera_flashmode_label_on">LAMPU KILAT AKTIF</string>
+  <string name="pref_camera_flashmode_label_on">LAMPU KILAT HIDUP</string>
   <string name="pref_camera_flashmode_label_off">LAMPU KILAT MATI</string>
   <!-- Default videocamera flash mode setting.-->
   <!-- Default white balance setting. -->
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index 518fdf875..e103e297b 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -18,10 +18,12 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- common aspect ratios -->
   <!-- aspect ratio greater than 16:9, so "widescreen" or "cinematic" -->
+  <string name="pref_camera_aspectratio_wide">와이드</string>
   <!-- Format for entries in the picture size menu. Parameter one is aspect ratio,
          parameter two is size in megapixels, e.g. "(4:3) 12.1 megapixels"
          NOTE: for Chinese (zh) and Korean (ko) the pixel number (parameter two)
          will be multiplied by 100 as those languages want to count by ten thousands -->
+  <string name="pref_camera_megapixel_format">(<xliff:g id="ratio" example="16:9">%1$s</xliff:g>) <xliff:g id="pixels">%2$1.1f</xliff:g>만 화소</string>
   <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">매크로+</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">모션 블러 감소</string>
@@ -102,4 +104,6 @@
   <string name="pref_camera_shutter_speed_title">셔터 속도</string>
   <string name="auto_hdr_enabled">자동 HDR 사용</string>
   <!-- Advanced options -->
+  <string name="developer_menu_enabled">고급 카메라 옵션이 활성화되었습니다</string>
+  <string name="developer_menu_disabled">고급 카메라 옵션이 비활성화되었습니다</string>
 </resources>
diff --git a/res/values-ko/qcomstrings.xml b/res/values-ko/qcomstrings.xml
index 722a33526..47d7dc37e 100644
--- a/res/values-ko/qcomstrings.xml
+++ b/res/values-ko/qcomstrings.xml
@@ -266,6 +266,8 @@
   <!-- Toast after 2k4k video is enabled to inform SeeMore has been disabled -->
   <string name="video_quality_4k_disable_SeeMore">SeeMore은 4K 비디오와 같이 켜질 수 없습니다</string>
   <!-- Toast after SeeMore has been enabled to show CDS is disabled -->
+  <string name="disable_CDS_during_SeeMore">SeeMore를 사용하면 상관 이중 샘플링 기능(CDS)이 꺼집니다</string>
   <!-- Toast after SeeMore has been enabled to show TNR is disabled -->
+  <string name="disable_TNR_during_SeeMore">SeeMore 기능을 사용하면 시간적 노이즈 감소 기능(TNR)이 꺼집니다</string>
   <!-- TODO: Remove these? -->
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 59ace3a7e..e5a4b3403 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -141,7 +141,9 @@
   <!-- message for the dialog showing the camera is disabled because of security policies. Camera cannot be used. -->
   <string name="camera_disabled">보안 정책으로 인해 카메라 사용이 중지되었습니다.</string>
   <!-- message for the dialog showing that the app does not have sufficient permissions [CHAR LIMIT=NONE] -->
+  <string name="error_permissions">앱을 실행하는 데 필수적인 권한이 부여되지 않았습니다. 권한 설정을 확인해 주세요.</string>
   <!-- Dialog "Dismiss" button. Closes the dialog [CHAR LIMIT=12]-->
+  <string name="dialog_dismiss">다시 묻지 않기</string>
   <!-- alert to the user to wait for some operation to complete -->
   <string name="wait">잠시 기다려 주세요\u2026</string>
   <!-- alert to the user that an SD card must be installed before using the camera -->
diff --git a/res/values-nl/qcomstrings.xml b/res/values-nl/qcomstrings.xml
index b0e81f3ec..d0b9a554c 100644
--- a/res/values-nl/qcomstrings.xml
+++ b/res/values-nl/qcomstrings.xml
@@ -230,22 +230,22 @@
   <!-- The alias of CameraActivity for gesture operation -->
   <string name="camera_gesture_title">Camera openen</string>
   <string name="all_in_focus">Alles in focus</string>
-  <string name="refocus_toast">Om laatste foto opnieuw scherp te stellen, tap hier</string>
+  <string name="refocus_toast">Om laatste foto opnieuw scherp te stellen, tik hier</string>
   <!-- Toast messages -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for High-framerate recording mode -->
   <string name="error_app_unsupported_hfr_selection">Opname met hoge beeldsnelheid wordt niet ondersteund bij digitale beeldstabilisatie, time-lapse of HDR.</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for Slow motion mode -->
   <string name="error_app_unsupported_hfr">Slow motion video wordt niet ondersteund bij deze resolutie. Selecteer een lagere resolutie</string>
   <!-- The message is shown in toast when the app encounters an unsupported resolution for Stabilization mode -->
-  <string name="error_app_unsupported_dis">Stabilisatie is niet ondersteund voor de geselecteerde videogrootte. Selecteer een kleinere videogrootte</string>
+  <string name="error_app_unsupported_dis">Stabilisatie wordt niet ondersteund voor de geselecteerde videogrootte. Selecteer een kleinere videogrootte</string>
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for High speed mode -->
   <string name="error_app_unsupported_hsr">Hoge snelheid video wordt niet ondersteund bij deze resolutie</string>
   <!-- The message is shown in dialog when the app encounters an unsupported video codec for HFR mode -->
   <string name="error_app_unsupported_hfr_codec">Alleen H.264-videocodec ondersteund bij opname met hoge beeldsnelheid</string>
   <!-- The message is shown in dialog when the app encounters an unsupported video resolution-->
-  <string name="error_app_unsupported">Videoresolutie niet ondersteund bij deze codec</string>
+  <string name="error_app_unsupported">Videoresolutie wordt niet ondersteund bij deze codec</string>
   <!--The message is shown in dialog when the raw snapshot is selected in Zero shutter lag mode-->
-  <string name="error_app_unsupported_raw">Raw beeldformaat wordt niet ondersteund in Zero shutter lag modus. Selecteer JPEG</string>
+  <string name="error_app_unsupported_raw">Raw beeldformaat wordt niet ondersteund in de stand zonder ontspanvertraging (ZSL). Selecteer JPEG</string>
   <string name="msg_cancel_longshot_for_limited_memory">Niet genoeg geheugen, continue opname wordt afgebroken</string>
   <!-- Toast showing non-supported functionality for flash in AE bracket -->
   <string name="flash_aebracket_message">Flits wordt niet ondersteund in AEB-stand</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 2bc9c71d4..42260e410 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -389,12 +389,12 @@
   <!-- The button to switch to the high quality mode. [CHAR LIMIT = NONE] -->
   <string name="accessibility_switch_to_gcam">Overschakelen naar hoge kwaliteit</string>
   <!-- The button in review mode indicating that the photo taking, video recording, and panorama saving session should be canceled [CHAR LIMIT = NONE] -->
-  <string name="accessibility_review_cancel">Controle annuleren</string>
+  <string name="accessibility_review_cancel">Annuleren</string>
   <!-- The button in review mode indicating that the taken photo/video is OK to be attached/uploaded [CHAR LIMIT = NONE] -->
-  <string name="accessibility_review_ok">Controle gereed</string>
+  <string name="accessibility_review_ok">Gereed</string>
   <!-- button in review mode indicate the user want to retake another photo/video for attachment [
 CHAR LIMIT = NONE] -->
-  <string name="accessibility_review_retake">Opnieuw maken na controle</string>
+  <string name="accessibility_review_retake">Opnieuw</string>
   <!-- Default text for a button that can be toggled on and off. -->
   <string name="capital_on">AAN</string>
   <!-- Default text for a button that can be toggled on and off. -->
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index e20d1ed22..99953ad96 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/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> megapixels</string>
   <!-- Settings screen, scene mode -->
   <string name="pref_camera_scenemode_entry_refocus">Macro+</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Redução de borrões de movimento</string>
diff --git a/res/values-sl/qcomstrings.xml b/res/values-sl/qcomstrings.xml
index b097dbe5f..796c5288a 100644
--- a/res/values-sl/qcomstrings.xml
+++ b/res/values-sl/qcomstrings.xml
@@ -41,7 +41,7 @@
   <string name="pref_camera_zsl_title">Brez zakasnitve sprožilca</string>
   <!-- Autofocus zone -->
   <string name="pref_camera_selectablezoneaf_title">Področje sam. ostrenja</string>
-  <string name="pref_camera_selectablezoneaf_entry_auto">Samod.</string>
+  <string name="pref_camera_selectablezoneaf_entry_auto">Samodejno</string>
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">Sredinsko uravnoteženo</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">Povprečje okvirja</string>
   <string name="pref_camera_selectablezoneaf_entry_spotmetering">Točkovno</string>
@@ -70,7 +70,7 @@
   <string name="pref_camera_video_hdr_title">HDR slike</string>
   <!-- CDS mode-->
   <string name="pref_camera_cds_title">Način CDS</string>
-  <string name="pref_camera_cds_entry_auto">Samod.</string>
+  <string name="pref_camera_cds_entry_auto">Samodejno</string>
   <!-- Video CDS-->
   <string name="pref_camera_video_cds_title">Način slike CDS</string>
   <string name="pref_camera_video_cds_entry_auto">Samodejno</string>
@@ -88,7 +88,7 @@
   <string name="pref_camera_ae_bracket_hdr_title">Korektura sam. osvetlitve</string>
   <!-- High-framerate recording -->
   <string name="pref_camera_hfr_title">Počasni posnetek</string>
-  <string name="pref_camera_hfr_entry_off">Izk.</string>
+  <string name="pref_camera_hfr_entry_off">Izklopljeno</string>
   <string name="pref_camera_hfr_entry_2x">Počasni posnetek 60 sl./s</string>
   <string name="pref_camera_hfr_entry_3x">Počasni posnetek 90 sl./s</string>
   <string name="pref_camera_hfr_entry_4x">Počasni posnetek 120 sl./s</string>
@@ -101,7 +101,7 @@
   <string name="pref_camera_denoise_title">Odstr. šuma</string>
   <!-- ISO -->
   <string name="pref_camera_iso_title">ISO</string>
-  <string name="pref_camera_iso_entry_auto">Samod.</string>
+  <string name="pref_camera_iso_entry_auto">Samodejno</string>
   <string name="pref_camera_iso_entry_isodeblur">Samodejno (HJR)</string>
   <string name="pref_camera_iso_entry_iso50">ISO 50</string>
   <string name="pref_camera_iso_entry_iso100">ISO 100</string>
@@ -132,7 +132,7 @@
   <string name="pref_camera_iso_entry_iso12800">ISO 12800</string>
   <!-- Antibanding -->
   <string name="pref_camera_antibanding_title">Odstranjevanje pasov</string>
-  <string name="pref_camera_antibanding_entry_0">Samod.</string>
+  <string name="pref_camera_antibanding_entry_0">Samodejno</string>
   <string name="pref_camera_antibanding_entry_1">50 Hz (Evropa)</string>
   <string name="pref_camera_antibanding_entry_2">60 Hz (ZDA)</string>
   <!-- Color effect -->
diff --git a/res/values-sq-rAL/cm_strings.xml b/res/values-sq-rAL/cm_strings.xml
index 92cc92c93..7858d89f0 100644
--- a/res/values-sq-rAL/cm_strings.xml
+++ b/res/values-sq-rAL/cm_strings.xml
@@ -18,17 +18,39 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- common aspect ratios -->
   <!-- aspect ratio greater than 16:9, so "widescreen" or "cinematic" -->
+  <string name="pref_camera_aspectratio_wide">E gjerë</string>
   <!-- Format for entries in the picture size menu. Parameter one is aspect ratio,
          parameter two is size in megapixels, e.g. "(4:3) 12.1 megapixels"
          NOTE: for Chinese (zh) and Korean (ko) the pixel number (parameter two)
          will be multiplied by 100 as those languages want to count by ten thousands -->
+  <string name="pref_camera_megapixel_format">(<xliff:g id="ratio" example="16:9">%1$s</xliff:g>) <xliff:g id="pixels">%2$1.1f</xliff:g> megapiksel</string>
   <!-- Settings screen, scene mode -->
+  <string name="pref_camera_scenemode_entry_refocus">Makro+</string>
+  <string name="pref_camera_scenemode_entry_baby">Bebe</string>
+  <string name="pref_camera_scenemode_entry_beach">Plazh</string>
+  <string name="pref_camera_scenemode_entry_landscape">Peizazh</string>
+  <string name="pref_camera_scenemode_entry_portrait">Portret</string>
+  <string name="pref_camera_scenemode_entry_snow">Borë</string>
+  <string name="pref_camera_scenemode_entry_sports">Sporte</string>
+  <string name="pref_camera_scenemode_entry_steadyphoto">Foto stabël</string>
   <!-- Settings screen, focus mode -->
+  <string name="pref_camera_focusmode_entry_continuous">E vazhdueshme</string>
+  <string name="pref_camera_focusmode_entry_mw_continuous">E vazhdueshme (MW)</string>
+  <string name="pref_camera_focusmode_entry_facedetect">Dallo fytyrën</string>
+  <string name="pref_camera_focusmode_entry_facepriority">Fytyra prioritet</string>
+  <string name="pref_camera_focusmode_entry_fixed">E fiksuar</string>
+  <string name="pref_camera_focusmode_entry_normal">Normale</string>
   <!-- Color effects -->
   <!-- Red eye flash mode title -->
   <!-- Power shutter -->
   <!-- Max brightness -->
   <!-- Touch focus duration -->
+  <string name="pref_camera_focustime_entry_0">0s</string>
+  <string name="pref_camera_focustime_entry_3">3s</string>
+  <string name="pref_camera_focustime_entry_5">5s</string>
+  <string name="pref_camera_focustime_entry_10">10s</string>
   <!-- Shutter speed -->
+  <string name="pref_camera_shutter_speed_title">Shpejtësia e shkrepjes</string>
+  <string name="auto_hdr_enabled">HDR automatik i aktivizuar</string>
   <!-- Advanced options -->
 </resources>
diff --git a/res/values-sq-rAL/qcomstrings.xml b/res/values-sq-rAL/qcomstrings.xml
index 63b1dec74..c7d8d59f6 100644
--- a/res/values-sq-rAL/qcomstrings.xml
+++ b/res/values-sq-rAL/qcomstrings.xml
@@ -34,50 +34,112 @@
   <!-- Autofocus zone -->
   <!-- Advanced features -->
   <!-- Manual exposure -->
+  <string name="pref_camera_manual_exp_entry_off">Inaktiv</string>
   <!-- Manual white balance -->
+  <string name="pref_camera_manual_wb_entry_off">Inaktiv</string>
   <!-- Manual focus -->
+  <string name="pref_camera_manual_focus_entry_off">Inaktiv</string>
   <!-- Still More -->
   <!-- Video HDR-->
+  <string name="pref_camera_video_hdr_title">Video HDR</string>
   <!-- CDS mode-->
   <!-- Video CDS-->
   <!-- TNR-->
   <!-- Video TNR -->
   <!-- Face detection -->
+  <string name="pref_camera_facedetection_title">Dallimi i fytyrës</string>
   <!-- Selfie Flash -->
   <!-- Red eye reduction -->
   <!-- AE bracketing -->
   <!-- High-framerate recording -->
+  <string name="pref_camera_hfr_entry_off">Inaktiv</string>
+  <string name="pref_camera_hfr_entry_hsr_60">Shpejtësi e lartë 60 FPS</string>
+  <string name="pref_camera_hfr_entry_hsr_90">Shpejtësi e lartë 90 FPS</string>
+  <string name="pref_camera_hfr_entry_hsr_120">Shpejtësi e lartë 120 FPS</string>
   <!-- See More -->
   <!-- Denoise -->
+  <string name="pref_camera_denoise_title">Reduktimi i zhurmave</string>
   <!-- ISO -->
+  <string name="pref_camera_iso_title">ISO</string>
+  <string name="pref_camera_iso_entry_auto">Auto</string>
+  <string name="pref_camera_iso_entry_isodeblur">Auto (HJR)</string>
+  <string name="pref_camera_iso_entry_iso50">ISO50</string>
+  <string name="pref_camera_iso_entry_iso100">ISO100</string>
+  <string name="pref_camera_iso_entry_iso125">ISO125</string>
+  <string name="pref_camera_iso_entry_iso150">ISO150</string>
+  <string name="pref_camera_iso_entry_iso200">ISO200</string>
+  <string name="pref_camera_iso_entry_iso250">ISO250</string>
+  <string name="pref_camera_iso_entry_iso1000">ISO1000</string>
+  <string name="pref_camera_iso_entry_iso1200">ISO1200</string>
+  <string name="pref_camera_iso_entry_iso1250">ISO1250</string>
+  <string name="pref_camera_iso_entry_iso1500">ISO1500</string>
+  <string name="pref_camera_iso_entry_iso1600">ISO1600</string>
+  <string name="pref_camera_iso_entry_iso2000">ISO2000</string>
+  <string name="pref_camera_iso_entry_iso2500">ISO2500</string>
+  <string name="pref_camera_iso_entry_iso2700">ISO2700</string>
+  <string name="pref_camera_iso_entry_iso3200">ISO3200</string>
+  <string name="pref_camera_iso_entry_iso6400">ISO6400</string>
+  <string name="pref_camera_iso_entry_iso12800">ISO12800</string>
   <!-- Antibanding -->
+  <string name="pref_camera_antibanding_title">Antibanding</string>
+  <string name="pref_camera_antibanding_entry_0">Automatikisht</string>
+  <string name="pref_camera_antibanding_entry_1">50 Hz (Evropë)</string>
+  <string name="pref_camera_antibanding_entry_2">60 Hz (SHBA)</string>
   <!-- Color effect -->
+  <string name="pref_camera_coloreffect_title">Efekti i ngjyrave</string>
+  <string name="pref_camera_coloreffect_entry_none">Asnjë</string>
+  <string name="pref_camera_coloreffect_entry_mono">Mono</string>
+  <string name="pref_camera_coloreffect_entry_sepia">Sepia</string>
+  <string name="pref_camera_coloreffect_entry_negative">Negativ</string>
   <!-- Color effect that overexposes and reverses some of the tones. -->
   <!-- Stabilization -->
   <!-- Face recognition -->
   <!-- Sharpness -->
   <!-- Contrast -->
+  <string name="pref_camera_contrast_title">Kontrasti</string>
   <!-- Saturation -->
+  <string name="pref_camera_saturation_title">Saturimi</string>
   <!-- Picture format -->
+  <string name="pref_camera_picture_format_title">Formati i fotos</string>
   <!-- Picture quality -->
+  <string name="pref_camera_jpegquality_title">Cilësia e fotos</string>
+  <string name="pref_camera_jpegquality_entry_0">55%</string>
+  <string name="pref_camera_jpegquality_entry_1">65% (normale)</string>
+  <string name="pref_camera_jpegquality_entry_2">75% (e mirë)</string>
+  <string name="pref_camera_jpegquality_entry_3">85% (shumë e mirë)</string>
+  <string name="pref_camera_jpegquality_entry_4">95%</string>
+  <string name="pref_camera_jpegquality_entry_5">100%</string>
   <!-- Histogram -->
+  <string name="pref_camera_histogram_title">Histogram</string>
   <!-- Auto scene detection -->
+  <string name="pref_camera_scenedetect_title">Përcaktimi automatik i peizazhit</string>
   <!-- Continuous shot -->
   <!-- Auto HDR -->
   <!-- HDR mode -->
   <!-- HDR needs 1x frame -->
   <!-- Video rotation -->
+  <string name="pref_camera_video_rotation_title">Rrotullimi i videos</string>
+  <string name="pref_camera_video_rotation_entry_0">0 gradë</string>
+  <string name="pref_camera_video_rotation_entry_90">90 gradë</string>
+  <string name="pref_camera_video_rotation_entry_180">180 gradë</string>
+  <string name="pref_camera_video_rotation_entry_270">270 gradë</string>
   <!-- Storage location -->
+  <string name="pref_camera_savepath_title">Vendndodhja e ruajtjes</string>
+  <string name="pref_camera_savepath_entry_0">Memoria e brëndshme</string>
+  <string name="pref_camera_savepath_entry_1">Karta SD</string>
   <!-- Misc -->
   <!-- The alias of CameraActivity for gesture operation -->
+  <string name="camera_gesture_title">Hap kamerën</string>
   <!-- Toast messages -->
   <!-- The message is shown in toast when the app encounters an unsupported selection for High-framerate recording mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for Slow motion mode -->
   <!-- The message is shown in toast when the app encounters an unsupported resolution for Stabilization mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for High speed mode -->
+  <string name="error_app_unsupported_hsr">Profili i shpejtësisë së lartë nuk është i suportuar për madhësinë e zgjedhur të videos. Zgjidhni një madhësi videoje më të vogël</string>
   <!-- The message is shown in dialog when the app encounters an unsupported video codec for HFR mode -->
   <!-- The message is shown in dialog when the app encounters an unsupported video resolution-->
   <!--The message is shown in dialog when the raw snapshot is selected in Zero shutter lag mode-->
+  <string name="msg_cancel_longshot_for_limited_memory">Memoria po mbaron. Për këtë arsye profili i fotove të vazhdueshme do të çaktivizohet</string>
   <!-- Toast showing non-supported functionality for flash in AE bracket -->
   <!-- toast message for storage location switch -->
   <!-- The message is shown in toast when click showOnMap Menu and there is no map app -->
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index b9b98620d..aa2dd0846 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -16,39 +16,81 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- The name of the Android Camera application. [CHAR LIMIT=16] -->
+  <string name="app_name">Kamera</string>
   <!-- The label for the Video Camera activity. [CHAR LIMIT=16] -->
   <!-- Used to format short video duration in Details dialog. minutes:seconds e.g. 00:30 -->
+  <string name="details_ms">%1$02d:%2$02d</string>
   <!-- Used to format video duration in Details dialog. hours:minutes:seconds e.g. 0:21:30 -->
+  <string name="details_hms">%1$d:%2$02d:%3$02d</string>
   <!-- Displayed in the title of the dialog for things to do with a picture
              that is to be "set as" (e.g. set as contact photo or set as wallpaper) -->
+  <string name="set_image">Cakto foton si</string>
   <!-- Details dialog "OK" button. Dismisses dialog. -->
+  <string name="delete">Fshi</string>
   <!-- String Delete the selected media item(s) [CHAR LIMIT=50] -->
+  <plurals name="delete_selection">
+    <item quantity="one">Dëshiron ta fshish elementin e zgjedhur?</item>
+    <item quantity="other">Dëshiron t\'i fshish elementët e zgjedhur?</item>
+  </plurals>
+  <string name="share">Ndaj</string>
+  <string name="share_panorama">Ndaj panoramën</string>
+  <string name="share_as_photo">Ndaje si foto</string>
   <!-- The label shown after an image is deleted [CHAR LIMIT=16] -->
+  <string name="deleted">U fshi</string>
   <!-- The label on the button which when clicked will undo a deletion of image [CHAR LIMIT=16]-->
+  <string name="details">Detajet</string>
+  <string name="close">Mbyll</string>
   <!-- String indicating how many media item(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
+  <plurals name="number_of_items_selected">
+    <item quantity="one">%1$d e zgjedhur</item>
+    <item quantity="other">%1$d të zgjedhura</item>
+  </plurals>
   <!-- String indicating how many media album(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
+  <plurals name="number_of_albums_selected">
+    <item quantity="one">%1$d e zgjedhur</item>
+    <item quantity="other">%1$d të zgjedhura</item>
+  </plurals>
   <!-- String indicating how many media group(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
+  <plurals name="number_of_groups_selected">
+    <item quantity="one">%1$d e zgjedhur</item>
+    <item quantity="other">%1$d të zgjedhura</item>
+  </plurals>
   <!-- String indicating timestamp of photo or video -->
+  <string name="show_on_map">Trego në hartë</string>
+  <string name="rotate_left">Rrotullo majtas</string>
+  <string name="rotate_right">Rrotullo djathtas</string>
   <!-- String used as a menu label. The user can choose to edit the image
          [CHAR_LIMIT=20]-->
+  <string name="edit">Redakto</string>
   <!-- The title of the menu item to let user crop the image. [CHAR LIMIT=15] -->
+  <string name="crop_action">Prite</string>
   <!-- The title of the menu item to let user trim the video. [CHAR LIMIT=15] -->
+  <string name="trim_action">Shkurto</string>
   <!-- The title of the menu item to let user set the image as background etc. [CHAR LIMIT=15] -->
+  <string name="set_as">Cakto si</string>
   <!-- String indicating an error when playing the video. [CHAR LIMIT=30] -->
   <!-- Toast message shown when the cropped image has been saved in the
          %s folder (string: folder_download) [CHAR LIMIT=50]-->
   <!-- Text indicating the title of a media item in details window [CHAR LIMIT=14] -->
+  <string name="title">Titulli</string>
   <!-- Text indicating the description of a media item in details window [CHAR LIMIT=14] -->
+  <string name="description">Përshkrimi</string>
   <!-- Text indicating the creation time of a media item in details window [CHAR LIMIT=14] -->
+  <string name="time">Ora</string>
   <!-- Text indicating the location of a media item in details window [CHAR LIMIT=14] -->
+  <string name="location">Vendndodhja</string>
   <!-- Text indicating the path of a media item in details window [CHAR LIMIT=14] -->
   <!-- Text indicating the width of a media item in details window [CHAR LIMIT=14] -->
+  <string name="width">Gjerësia</string>
   <!-- Text indicating the height of a media item in details window [CHAR LIMIT=14] -->
+  <string name="height">Lartësia</string>
   <!-- Text indicating the orientation of a media item in details window [CHAR LIMIT=14] -->
+  <string name="orientation">Orientimi</string>
   <!-- Text indicating the duration of a video item in details window [CHAR LIMIT=18] -->
+  <string name="duration">Kohëzgjatja</string>
   <!-- Text indicating the mime type of a media item in details window [CHAR LIMIT=14] -->
   <!-- Text indicating the file size of a media item in details window [CHAR LIMIT=14] -->
   <!-- Text indicating the maker of a media item in details window [CHAR LIMIT=14] -->
@@ -59,6 +101,7 @@
   <!-- Text indicating the white balance of a media item in details window [CHAR LIMIT=18] -->
   <!-- Text indicating the exposure time of a media item in details window [CHAR LIMIT=14] -->
   <!-- Text indicating the ISO speed rating of a media item in details window [CHAR LIMIT=14] -->
+  <string name="iso">ISO</string>
   <!-- String indicating the time units in seconds. [CHAR LIMIT=8] -->
   <!-- String indicating the length units in milli-meters. [CHAR LIMIT=8] -->
   <!-- String indicating how camera shooting feature is used. [CHAR LIMIT=12] -->
@@ -75,21 +118,29 @@
   <!-- message for the dialog showing the camera is disabled because of security policies. Camera cannot be used. -->
   <!-- message for the dialog showing that the app does not have sufficient permissions [CHAR LIMIT=NONE] -->
   <!-- Dialog "Dismiss" button. Closes the dialog [CHAR LIMIT=12]-->
+  <string name="dialog_dismiss">Largo</string>
   <!-- alert to the user to wait for some operation to complete -->
   <!-- alert to the user that an SD card must be installed before using the camera -->
+  <string name="no_storage" product="default">Fut një kartë SD përpara se të përdorësh kamerën.</string>
   <!-- alert to the user that the SD card is being disk-checked -->
+  <string name="preparing_sd" product="default">Duke përgatitur kartën SD\u2026</string>
   <!-- alert to the user that the camera fails to read or write the SD card. -->
+  <string name="access_sd_fail" product="default">Karta SD nuk mund të aksesohet.</string>
   <!-- A label that overlays on top of the preview frame to indicate the camcorder is in time lapse mode [CHAR LIMIT=35] -->
   <!-- Screen display message during image capture to indicate that the capture is in progress, like during HDR+. [CHAR LIMIT=20] -->
   <!-- Settings screen, camera selection dialog title. Users can select a camera from the phone (front-facing or back-facing). [CHAR LIMIT=20] -->
+  <string name="pref_camera_id_title">Zgjidh kamerën</string>
   <!-- In select camera setting, back facing camera. [CHAR LIMIT=14] -->
+  <string name="pref_camera_id_entry_back">E pasme</string>
   <!-- In select camera setting, front-facing camera. [CHAR LIMIT=14] -->
   <!-- Settings screen, setting title text -->
   <!--  Label for record location preference [CHAR LIMIT=50] -->
+  <string name="pref_camera_location_label">VENDNDODHJA</string>
   <!-- Title for countdown timer on camera settings screen [CHAR LIMIT=30]-->
   <!-- Entry for countdown timer setting. e.g. 1 second, 10 seconds, etc. [CHAR LIMIT=30]-->
   <!-- Text followed by a checkbox to turn on/off sound effects during the countdown. [CHAR LIMIT = 24]-->
   <!-- Entry of a on/off setting. The setting is turned off. [CHAR LIMIT=15] -->
+  <string name="setting_off">Inaktiv</string>
   <!-- Entry of a on/off setting. The setting is turned on. [CHAR LIMIT=15] -->
   <!-- The value of a camera preference indicating the setting is off. -->
   <!-- The value of a camera preference indicating the setting is on. -->
@@ -117,9 +168,15 @@
   <!-- Settings screen, Flash mode title -->
   <!-- flash label [CHAR LIMIT=50] -->
   <!-- Settings screen, Flash mode 'auto'. [CHAR LIMIT=12] -->
+  <string name="pref_camera_flashmode_entry_auto">Automatik</string>
   <!-- Settings screen, Flash mode 'alway on'. [CHAR LIMIT=12] -->
+  <string name="pref_camera_flashmode_entry_on">Aktiv</string>
   <!-- Settings screen, Flash mode 'always off'. [CHAR LIMIT=12] -->
+  <string name="pref_camera_flashmode_entry_off">Inaktiv</string>
   <!-- Menu, flash mode labels [CHAR LIMIT=50] -->
+  <string name="pref_camera_flashmode_label_auto">BLICI AUTOMATIK</string>
+  <string name="pref_camera_flashmode_label_on">BLICI AKTIV</string>
+  <string name="pref_camera_flashmode_label_off">BLICI INAKTIV</string>
   <!-- Default videocamera flash mode setting.-->
   <!-- Default white balance setting. -->
   <!-- Settings screen, white balance title -->
@@ -130,50 +187,78 @@
   <!-- Settings screen, Select Scene mode -->
   <!-- Settings menu, scene mode choices [CHAR LIMIT=16] -->
   <!-- Scene mode that uses HDR plus (better HDR) [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_hdr_plus">HDR+</string>
   <!-- Scene mode that uses HDR (high dynamic range) [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_hdr">HDR</string>
   <!-- Scene mode to turn on HDR (better high dynamic range) [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_entry_turn_hdr_plus_on">HDR+ AKTIV</string>
   <!-- Scene mode to turn off HDR (better high dynamic range) [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_entry_turn_hdr_plus_off">HDR+ INAKTIV</string>
   <!-- Scene mode to turn on HDR (high dynamic range) [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_entry_turn_hdr_on">HDR AKTIV</string>
   <!-- Scene mode to turn off HDR (high dynamic range) [CHAR LIMIT=50] -->
+  <string name="pref_camera_scenemode_entry_turn_hdr_off">HDR INAKTIV</string>
   <!-- Scene mode that takes an image quickly with little motion blur. [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_action">Veprimi</string>
   <!-- Scene mode that takes long exposures to capture night scenes without flash. [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_night">Natë</string>
   <!-- Scene mode optimized for taking images in the sunset. [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_sunset">Perëndim dielli</string>
   <!-- Scene mode optimized for taking indoor low-lights pictures. [CHAR LIMIT=16] -->
+  <string name="pref_camera_scenemode_entry_party">Festë</string>
   <!-- Settings menu, scene mode labels [CHAR LIMIT=50] -->
   <!-- Scene mode that takes an image quickly with little motion blur. [CHAR LIMIT=50] -->
   <!-- Scene mode that takes long exposures to capture night scenes without flash. [CHAR LIMIT=50] -->
   <!-- Scene mode optimized for taking images in the sunset. [CHAR LIMIT=50] -->
   <!-- Scene mode optimized for taking indoor low-lights pictures. [CHAR LIMIT=50] -->
   <!-- Settings menu countdown timer off [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_off">KOHËMATESI INAKTIV</string>
   <!-- Settings menu countdown timer 1 second [CHAR LIMIT=50] -->
   <!-- Settings menu countdown timer 3 seconds [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_three">3 SEKONDA</string>
   <!-- Settings menu countdown timer 10 seconds [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_ten">10 SEKONDA</string>
   <!-- Settings menu countdown timer 15 seconds [CHAR LIMIT=50] -->
+  <string name="pref_camera_countdown_label_fifteen">15 SEKONDA</string>
   <!-- Toast after trying to select a setting that is not allowed to change in scene mode [CHAR LIMIT=NONE] -->
   <!-- Exposure settings in preference -->
   <!--  menu label exposure compensation [CHAR LIMIT=50] -->
+  <string name="pref_exposure_label">EKSPOZIMI</string>
   <!-- Default HDR entry value -->
   <!-- Default HDR+ entry value -->
   <!-- HDR label ON [CHAR LIMIT=60] -->
+  <string name="pref_camera_hdr_label">HDR</string>
   <!-- switch camera label back [CHAR LIMIT=60] -->
+  <string name="pref_camera_id_label_back">KAMERA PARËSORE</string>
   <!-- switch camera label front [CHAR LIMIT=60] -->
+  <string name="pref_camera_id_label_front">KAMERA E PASME</string>
   <!-- Dialog "OK" button. Dismisses dialog. -->
+  <string name="dialog_ok">OK</string>
   <!-- Low-memory dialog message [CHAR LIMIT=NONE] -->
+  <string name="spaceIsLow_content" product="default">Karta SD është pothuajse e mbushur plot. Ndrysho parametrat e cilësisë ose fshi disa imazhe apo disa skedarë të tjerë.</string>
   <!-- Camera format string for new image files. Passed to java.text.SimpleDateFormat. -->
   <!-- Video Camera format string for new video files. Passed to java.text.SimpleDateFormat. -->
   <!-- Filename prefix for panorama output. -->
   <!-- The message shown when video record reaches size limit. -->
   <!-- The text shown when the panorama panning speed is to fast [CHAR LIMIT=16] -->
+  <string name="pano_too_fast_prompt">Shumë shpejt</string>
   <!-- The text shown in the progress dialog when panorama preview is generating in the background [CHAR LIMIT=30] -->
+  <string name="pano_dialog_prepare_preview">Duke përgatitur panoramën</string>
   <!-- The text shown in the dialog when panorama saving failed [CHAR LIMIT=40] -->
   <!-- The text shown on the dialog title in the dialogs for Panorama [CHAR LIMIT=12] -->
+  <string name="pano_dialog_title">Panoramë</string>
   <!-- The text shown on the top-left corner of the screen to indicate the capturing is on going [CHAR LIMIT=27] -->
+  <string name="pano_capture_indication">Duke kapur panoramën</string>
   <!-- The text shown in the progress dialog when waiting for previous panorama finishing [CHAR LIMIT=40] -->
+  <string name="pano_dialog_waiting_previous">Duke pritur për panoramën e mëparshme</string>
   <!-- The text shown on the bottom-left corner of the screen to indicate that the saving is in process [CHAR LIMIT=13] -->
+  <string name="pano_review_saving_indication_str">Duke ruajtur\u2026</string>
   <!-- The text shown on the screen to indicate that the panorama is rendering [CHAR LIMIT=27] -->
   <!-- Toast telling users tapping on the viewfinder will trigger autofocus [CHAR LIMIT=28] -->
+  <string name="tap_to_focus">Prek për të fokusuar.</string>
   <!-- Default effect setting that clears the effect. -->
   <!-- Title of video effect setting popup window -->
+  <string name="pref_video_effect_title">Efektet</string>
   <!-- Effect setting item that clear the effect. [CHAR LIMIT=14] -->
   <!-- Effect setting item that squeezes the face. [CHAR LIMIT=14] -->
   <!-- Effect setting item that makes eyes big. [CHAR LIMIT=14] -->
@@ -182,30 +267,45 @@
   <!-- Effect setting item that makes nose big. [CHAR LIMIT=14] -->
   <!-- Effect setting item that makes eyes small. [CHAR LIMIT=14] -->
   <!-- Effect setting item that replaces background with Android in Space. [CHAR LIMIT=14] -->
+  <string name="effect_backdropper_space">Në kozmos</string>
   <!-- Effect setting item that replaces background with a sunset. [CHAR LIMIT=14] -->
+  <string name="effect_backdropper_sunset">Perëndim dielli</string>
   <!-- Effect setting item that replaces background with video from gallery. [CHAR LIMIT=14] -->
+  <string name="effect_backdropper_gallery">Videoja juaj</string>
   <!-- Toast telling users tapping on the viewfinder will take a picture [CHAR LIMIT=54] -->
+  <string name="video_snapshot_hint">Prek për të bërë foto gjatë regjistrimit.</string>
   <!-- Announcement telling users video recording has just started [CHAR LIMIT=NONE] -->
   <!-- Announcement telling users video recording has just stopped [CHAR LIMIT=NONE] -->
+  <string name="video_recording_stopped">Regjistrimi i videos është ndaluar.</string>
   <!-- A button in effect setting popup to clear the effect. [CHAR LIMIT=26] -->
   <!-- Title of category for silly face effects. [CHAR LIMIT=26] -->
   <!-- Title of category for background replacement effects. [CHAR LIMIT=26] -->
+  <string name="effect_background">SFONDI</string>
   <!-- The shutter button. [CHAR LIMIT = NONE] -->
   <!-- The menu button. [CHAR LIMIT = NONE] -->
   <!-- The mode picker to switch between camera, video and panorama. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_mode_picker">Zgjedhësi i kamerës, videos, ose panoramës</string>
   <!-- The check box in camera settings, such as store location. [CHAR LIMIT = NONE] -->
   <!-- The button to switch to Camera mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_camera">Kthe në foto</string>
   <!-- The button to switch to Video mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_video">Kthe në video</string>
   <!-- The button to switch to Panorama mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_panorama">Kthe në panoramë</string>
   <!-- The button to switch to the Photo Sphere mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_photo_sphere">Kthe në Photo Sphere</string>
   <!-- The button to switch to the high quality mode. [CHAR LIMIT = NONE] -->
+  <string name="accessibility_switch_to_gcam">Kthe në cilësi të lartë</string>
   <!-- The button in review mode indicating that the photo taking, video recording, and panorama saving session should be canceled [CHAR LIMIT = NONE] -->
   <!-- The button in review mode indicating that the taken photo/video is OK to be attached/uploaded [CHAR LIMIT = NONE] -->
   <!-- button in review mode indicate the user want to retake another photo/video for attachment [
 CHAR LIMIT = NONE] -->
   <!-- Default text for a button that can be toggled on and off. -->
+  <string name="capital_on">AKTIV</string>
   <!-- Default text for a button that can be toggled on and off. -->
+  <string name="capital_off">INAKTIV</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_off">Inaktiv</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
@@ -216,47 +316,86 @@ CHAR LIMIT = NONE] -->
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_10000">10 sekonda</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_12000">12 sekonda</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_15000">15 sekonda</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_24000">24 sekonda</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_30000">0.5 minuta</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_60000">1 minutë</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_90000">1.5 minuta</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_120000">2 minuta</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_150000">2.5 minuta</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_180000">3 minuta</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_240000">4 minuta</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_300000">5 minuta</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_360000">6 minuta</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_600000">10 minuta</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_720000">12 minuta</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_900000">15 minuta</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_1440000">24 minuta</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_1800000">0.5 orë</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_3600000">1 orë</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_5400000">1.5 orë</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_7200000">2 orë</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_9000000">2.5 orë</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_10800000">3 orë</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_14400000">4 orë</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_18000000">5 orë</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_21600000">6 orë</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_36000000">10 orë</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_43200000">12 orë</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_54000000">15 orë</string>
   <!-- Text to indicate time lapse recording frame interval [CHAR LIMIT = 30] -->
+  <string name="pref_video_time_lapse_frame_interval_86400000">24 orë</string>
   <!-- Seconds: a unit of time for time lapse intervals. [CHAR LIMIT = 20] -->
+  <string name="time_lapse_seconds">sekonda</string>
   <!-- Minutes: a unit of time for time lapse intervals. [CHAR LIMIT = 20] -->
+  <string name="time_lapse_minutes">minuta</string>
   <!-- Hours: a unit of time for time lapse intervals. [CHAR LIMIT = 20] -->
+  <string name="time_lapse_hours">orë</string>
   <!-- The button to confirm time-lapse setting changes. [CHAR LIMIT = 20] -->
+  <string name="time_lapse_interval_set">U krye</string>
   <!-- Title in time interval picker for setting time interval. [CHAR LIMIT = 30]-->
+  <string name="set_time_interval">Cakto Intervalin Kohor</string>
   <!-- Help text that is shown when the time lapse feature is turned off. [CHAR LIMIT = 180]-->
   <!-- Title in timer setting for setting the duration for the countdown timer. [CHAR LIMIT = 50]-->
+  <string name="set_duration">Cakto kohëzgjatjen në sekonda</string>
   <!-- On-screen hint during timer countdown for taking a photo. [CHAR LIMIT = 60]-->
+  <string name="count_down_title_text">Duke numëruar mbrapsht për të shkrepur foton</string>
   <!-- Title for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 50] -->
   <!-- Message for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = None] -->
   <!-- Negative answer for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 20] -->
+  <string name="remember_location_no">Jo faleminderit</string>
   <!-- Positive answer for first run dialog asking if the user wants to remember photo locations [CHAR LIMIT = 20] -->
+  <string name="remember_location_yes">Po</string>
   <!-- Camera menu labels -->
   <!-- more options label [CHAR LIMIT=50] -->
   <!-- settings label [CHAR LIMIT=50] -->
@@ -264,10 +403,15 @@ CHAR LIMIT = NONE] -->
   <!-- Button to press for creating a tiny planet image. [CHAR LIMIT = 30] -->
   <!-- Message shown while a tiny planet image is being saved. [CHAR LIMIT = 30] -->
   <!-- Label above a slider that let's the user set the zoom of a tiny planet image. [CHAR LIMIT = 15] -->
+  <string name="tiny_planet_zoom">Zmadho</string>
   <!-- Label above a slider that let's the user set the rotation of a tiny planet image. [CHAR LIMIT = 15] -->
+  <string name="tiny_planet_rotate">Rrotullo</string>
   <!-- Crop -->
   <!-- Label for the save button in the crop activity action bar [CHAR LIMIT=20] -->
+  <string name="crop_save">Ruaj</string>
   <!--  String shown when we cannot load the image when starting the activity [CHAR LIMIT=NONE] -->
+  <string name="cannot_load_image">Imazhi nuk mund të ngarkohet!</string>
   <!-- Label for album filmstrip button -->
   <!--  String shown when setting the homepage wallpaper in the background [CHAR LIMIT=NONE] -->
+  <string name="setting_wallpaper">Duke vendosur sfondin</string>
 </resources>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index 3753089a7..c844a7eb9 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -18,6 +18,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- common aspect ratios -->
   <!-- aspect ratio greater than 16:9, so "widescreen" or "cinematic" -->
+  <string name="pref_camera_aspectratio_wide">Bred</string>
   <!-- Format for entries in the picture size menu. Parameter one is aspect ratio,
          parameter two is size in megapixels, e.g. "(4:3) 12.1 megapixels"
          NOTE: for Chinese (zh) and Korean (ko) the pixel number (parameter two)
diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
index c7bc67a4c..7b4d9ebb6 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -64,7 +64,7 @@
   <string name="pref_camera_scenemode_entry_spotlight">Направлене світло</string>
   <string name="pref_camera_scenemode_entry_steadyphoto">Стабільне фото</string>
   <string name="pref_camera_scenemode_entry_supernight">Темна ніч</string>
-  <string name="pref_camera_scenemode_entry_sweepstitch">Панаромна зйомка</string>
+  <string name="pref_camera_scenemode_entry_sweepstitch">Панорамна зйомка</string>
   <string name="pref_camera_scenemode_entry_text">Текст</string>
   <string name="pref_camera_scenemode_entry_theatre">Театр</string>
   <string name="pref_camera_scenemode_entry_whiteboard">Біла дошка</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 9bdb3ea0d..ff08aec4b 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -520,7 +520,7 @@ CHAR LIMIT = NONE] -->
   <!-- Message shown while a tiny planet image is being saved. [CHAR LIMIT = 30] -->
   <string name="saving_tiny_planet">Збереження крихітної планети &#8230;</string>
   <!-- Label above a slider that let's the user set the zoom of a tiny planet image. [CHAR LIMIT = 15] -->
-  <string name="tiny_planet_zoom">Маштабування</string>
+  <string name="tiny_planet_zoom">Масштабування</string>
   <!-- Label above a slider that let's the user set the rotation of a tiny planet image. [CHAR LIMIT = 15] -->
   <string name="tiny_planet_rotate">Повернути</string>
   <!-- Crop -->
-- 
cgit v1.2.3