Automatic translation import

Change-Id: I33f654de17045dd88cb6bab0a46d16b6ab8d0022

15 files changed, 120 insertions, 11 deletions

diff --git a/res/values-ast-rES/camera2arrays.xml b/res/values-ast-rES/camera2arrays.xml
index d8400dd11..ec2696788 100644
--- a/res/values-ast-rES/camera2arrays.xml
+++ b/res/values-ast-rES/camera2arrays.xml
@@ -28,10 +28,22 @@
      IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 <resources>
+  <string-array name="pref_camera2_mono_only_entries">
+    <item>Sí</item>
+    <item>Non</item>
+  </string-array>
   <string-array name="pref_camera2_initial_camera_entries">
     <item>Bayer</item>
     <item>Mono</item>
-    <item>Front</item>
+    <item>Frontal</item>
+  </string-array>
+  <string-array name="pref_camera2_makeup_entries">
+    <item>Sí</item>
+    <item>Non</item>
+  </string-array>
+  <string-array name="pref_camera2_trackingfocus_entries">
+    <item>Sí</item>
+    <item>Non</item>
   </string-array>
   <!-- Refer to CONTROL_SCENE_MODE of Camera2 API for values
         -1 refers to ones not supported in Camera2 API
diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml
index 30c70a96f..e96543f0d 100644
--- a/res/values-ast-rES/cm_strings.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -18,13 +18,24 @@
 <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">(%1$s) %2$1.1f megapíxeles</string>
   <!-- Settings screen, scene mode -->
+  <string name="pref_camera_scenemode_entry_antimotionblur">Reductor de desenfoque</string>
+  <string name="pref_camera_scenemode_entry_aqua">Agua</string>
   <string name="pref_camera_scenemode_entry_ar">Realidá aumentada</string>
+  <string name="pref_camera_scenemode_entry_asd">Meyor disparu</string>
+  <string name="pref_camera_scenemode_entry_baby">Bebé</string>
+  <string name="pref_camera_scenemode_entry_backgroundblur">Fondu desenfocáu</string>
+  <string name="pref_camera_scenemode_entry_backlight">Contralluz</string>
+  <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_candlelight">Lluz de vela</string>
   <string name="pref_camera_scenemode_entry_highsensitivity">Sensibilidá alta</string>
   <!-- Settings screen, focus mode -->
   <string name="pref_camera_focusmode_entry_normal">Normal</string>
diff --git a/res/values-ast-rES/qcomstrings.xml b/res/values-ast-rES/qcomstrings.xml
index 198af0085..5116d0ab9 100644
--- a/res/values-ast-rES/qcomstrings.xml
+++ b/res/values-ast-rES/qcomstrings.xml
@@ -26,13 +26,19 @@
   <!-- Video quality setting entry. Videos will be recorded in QVGA quality. [CHAR LIMIT=24] -->
   <!-- Video quality setting entry. Videos will be recorded in QCIF quality. [CHAR LIMIT=24] -->
   <!-- Settings screen, Power Mode title -->
+  <string name="pref_camera_powermode_title">Mou d\'enerxía</string>
   <!-- Settings screen, Power mode dialog radio button choices -->
+  <string name="pref_camera_powermode_entry_lp">Batería baxa</string>
+  <string name="pref_camera_powermode_entry_np">Potencia normal</string>
   <!-- Settings screen, Power mode dialog radio button choices -->
   <!-- Default Power mode.. -->
   <!-- Default auto exposure setting. Do not translate. -->
   <!-- Settings screen, Select auto exposure title -->
   <string name="pref_camera_autoexposure_title">Auto-esposición</string>
   <!-- Settings screen, auto exposure dialog radio button choices -->
+  <string name="pref_camera_autoexposure_entry_frameaverage">Media de marcos</string>
+  <string name="pref_camera_autoexposure_entry_centerweighted">Ponderada al centru</string>
+  <string name="pref_camera_autoexposure_entry_spotmetering">Midición puntual</string>
   <!-- Auto exposure entry values. Do not translate. -->
   <!-- Settings screen, Video encoder title -->
   <string name="pref_camera_videoencoder_title">Códec de videu</string>
@@ -74,11 +80,17 @@
   <string name="pref_camera_instant_capture_entry_disable" translatable="true">Deshabilitar</string>
   <!-- Instant Capture entry values -->
   <!-- Settings screen, ZSL location dialog choices -->
+  <string name="pref_camera_zsl_entry_on">Sí</string>
   <!-- The message is shown in toast when HDR or scene mode is enabled -->
+  <string name="hdr_enable_message">HDR ta habilitao, namái se sofita\'l mou d\'escena automática</string>
+  <string name="scene_enable_message">El HDR namái ta sofitao nel mou d\'escena automática</string>
   <!-- Settings screen, Video HDR location dialog choices -->
+  <string name="pref_camera_video_hdr_entry_on">Sí</string>
   <!-- Settings screen, CDS location dialog choices -->
+  <string name="pref_camera_cds_entry_on">Sí</string>
   <string name="pref_camera_cds_entry_auto">Auto</string>
   <!-- Settings screen, video CDS location dialog choices -->
+  <string name="pref_camera_video_cds_entry_on">Sí</string>
   <string name="pref_camera_video_cds_entry_auto">Auto</string>
   <!-- Settings screen, TNR location dialog choices -->
   <string name="pref_camera_tnr_entry_disable">Deshabilitar</string>
@@ -106,14 +118,17 @@
   <!-- Settings screen, Select Face Detection -->
   <string name="pref_camera_facedetection_title">Deteición de cares</string>
   <!-- Settings menu, Face Detection choices -->
+  <string name="pref_camera_facedetection_entry_on">Sí</string>
   <!-- Default Selfie Flash setting. -->
   <!-- Settings screen, Selfie Flash Detection -->
   <!-- Settings menu, Selfie Flash choices -->
+  <string name="pref_selfie_flash_entry_on">Sí</string>
   <!-- Default redeye reduction setting. -->
   <!-- Settings screen, Select Redeye Reduction -->
   <!-- Settings menu, redeye reduction choices -->
   <string name="pref_camera_redeyereduction_entry_enable">Habilitar</string>
   <string name="pref_camera_redeyereduction_entry_disable">Deshabilitar</string>
+  <string name="pref_camera_selfiemirror_title" translatable="true">Espeyu d\'autoretratu</string>
   <string name="pref_camera_selfiemirror_entry_enable">Habilitar</string>
   <string name="pref_camera_selfiemirror_entry_disable">Deshabilitar</string>
   <!-- Default mce setting. Do not translate. -->
@@ -127,6 +142,8 @@
   <string name="error_app_unsupported_profile">Perfil non sofitáu de videu</string>
   <!--The message is shown in dialog when the raw snapshot is selected in zsl mode-->
   <!-- Settings screen, AE bracketing and HDR location dialog choices -->
+  <string name="pref_camera_ae_bracket_hdr_entry_on">Sí</string>
+  <string name="err_app_unsupport_ae_bracket_code">Entá nun se sofita l\'horquiláu AE</string>
   <!-- The messsage shown if user selects a snapshot resolution lower than the current video size. -->
   <!-- The messsage shown if user selects a snapshot resolution in low power mode. -->
   <!-- The messsage shown if user tries to take snapshot during D1/QCIF resolution. -->
@@ -144,10 +161,12 @@
   <!-- Default see more setting. Do not translate. -->
   <!-- Settings screen, Select See More title -->
   <!-- Settings screen, see more radio button choices -->
+  <string name="pref_camera_see_more_entry_on">Sí</string>
   <!-- see more entry values. Do not translate. -->
   <!-- Denoise Settings screen, setting title text -->
   <string name="pref_camera_denoise_title">Amenorgar ruíu</string>
   <!-- Denoise Settings screen, Record location dialog choices -->
+  <string name="pref_camera_denoise_entry_on">Sí</string>
   <!-- Default iso setting. Do not translate. -->
   <!-- Settings screen, Select Iso title -->
   <string name="pref_camera_iso_title">ISO</string>
@@ -167,6 +186,7 @@
   <string name="pref_camera_antibanding_entry_2">60 Hz (EE.XX)</string>
   <string name="pref_camera_antibanding_entry_3">Auto</string>
   <!-- Default color effect setting. -->
+  <string name="pref_camera_filter_mode_entry_on">Sí</string>
   <!-- Settings screen, Select Color effect title -->
   <string name="pref_camera_coloreffect_title">Efeutu de color</string>
   <string name="pref_camera_filter_mode_title">Efeutu de color</string>
@@ -175,11 +195,14 @@
   <string name="pref_camera_coloreffect_entry_negative">Negativu</string>
   <!-- Color effect that overexposes and reverses some of the tones. -->
   <!-- Settings screen, Touch AF/AEC dialog radio button choices -->
+  <string name="pref_camera_touchafaec_entry_on">Sí</string>
   <!-- Select IS title -->
   <string name="pref_camera_dis_title">Estabilización</string>
   <!-- DIS choices -->
+  <string name="pref_camera_dis_entry_on">Sí</string>
   <!-- Select Face Recognition title -->
   <!-- Face Recognition choices -->
+  <string name="pref_camera_facerc_entry_on">Sí</string>
   <!-- Settings screen, Multiple levels entries -->
   <string name="pref_camera_sharpness_entry_level0">Nivel 0</string>
   <string name="pref_camera_sharpness_entry_level1">Nivel 1</string>
@@ -239,6 +262,7 @@
   <!-- Settings screen, Select Auto Scene Detection -->
   <!-- Settings menu, auto scene detection choices -->
   <!-- Scene detection set to on - supports backlight and snow cloudy detection. -->
+  <string name="pref_camera_scenedetect_entry_on">Sí</string>
   <!-- Toast showing error if invalid size selected for  time lapse  [CHAR LIMIT=65] -->
   <!-- longshot value -->
   <!-- Toast showing non-supported functionality for flash in AE bracket -->
@@ -272,6 +296,7 @@
   <!-- The alas of CameraActivity for gesture operation -->
   <string name="camera_gesture_title">Llanzar cámara</string>
   <string name="pref_camera_tsmakeup_title">Gapura</string>
+  <string name="pref_camera_tsmakeup_entry_on">Sí</string>
   <string name="text_tsmakeup_alert_title">Alvertencia</string>
   <string name="text_tsmakeup_alert_msg">Ha habilitase la deteición de cares pa usar la carauterística de guapura. ¿Quies siguir?</string>
   <string name="text_tsmakeup_alert_continue">Siguir</string>
@@ -297,12 +322,16 @@
   <string name="pref_camera2_camera2_entry_enable">Habilitar</string>
   <string name="pref_camera2_mono_only_title">Namái mono</string>
   <string name="pref_camera2_mono_preview_title">Previsualización mono</string>
+  <string name="pref_camera2_mono_preview_entry_on">Sí</string>
+  <string name="pref_camera2_clearsight_entry_on">Sí</string>
   <string name="clearsight_capture_fail">Falló la captura ClearSight</string>
   <string name="pref_camera2_mpo_title">Formatu MPO</string>
+  <string name="pref_camera2_mpo_entry_on">Sí</string>
   <string name="pref_camera2_noise_reduction_title">Reducción de ruíu</string>
   <string name="pref_camera2_noise_reduction_entry_high_quality">Calidá alta</string>
   <string name="pref_camera2_videosnap_entry_enable">Habilitar</string>
   <string name="pref_camera_scenemode_entry_bestpicture">La meyor semeya</string>
   <string name="bestpicture_done">FECHO</string>
   <string name="bestpicture_at_least_one_picture">Tien d\'esbillase polo menos una semeya.</string>
+  <string name="pref_camera2_shutter_sound_entry_on">Sí</string>
 </resources>
diff --git a/res/values-ast-rES/strings.xml b/res/values-ast-rES/strings.xml
index 356a62e2a..7b1c6b68f 100644
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -18,12 +18,14 @@
   <!-- The name of the Android Camera application. [CHAR LIMIT=16] -->
   <string name="app_name">Cámara</string>
   <!-- The label for the Video Camera activity. [CHAR LIMIT=16] -->
+  <string name="video_camera_label">Videocámara</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">Afitar como</string>
   <!-- Details dialog "OK" button. Dismisses dialog. -->
   <string name="delete">Desaniciar</string>
   <!-- String Delete the selected media item(s) [CHAR LIMIT=50] -->
@@ -32,34 +34,58 @@
     <item quantity="other">¿Desaniciar los elementos esbillaos?</item>
   </plurals>
   <string name="share">Compartir</string>
+  <string name="share_panorama">Compartir panorámica</string>
+  <string name="share_as_photo">Compartir como semeya</string>
   <!-- The label shown after an image is deleted [CHAR LIMIT=16] -->
+  <string name="deleted">Desaniciáu</string>
   <!-- The label on the button which when clicked will undo a deletion of image [CHAR LIMIT=16]-->
   <string name="undo">DESFACER</string>
+  <string name="details">Detalles</string>
+  <string name="close">Zarrar</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 esbilláu</item>
+    <item quantity="other">%1$d esbillaos</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 esbilláu</item>
+    <item quantity="other">%1$d esbillaos</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 esbilláu</item>
+    <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 used as a menu label. The user can choose to edit the image
          [CHAR_LIMIT=20]-->
   <!-- The title of the menu item to let user crop the image. [CHAR LIMIT=15] -->
   <!-- The title of the menu item to let user trim the video. [CHAR LIMIT=15] -->
   <!-- The title of the menu item to let user set the image as background etc. [CHAR LIMIT=15] -->
   <!-- String indicating an error when playing the video. [CHAR LIMIT=30] -->
+  <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]-->
   <!-- Text indicating the title of a media item in details window [CHAR LIMIT=14] -->
   <!-- Text indicating the description of a media item in details window [CHAR LIMIT=14] -->
   <!-- Text indicating the creation time of a media item in details window [CHAR LIMIT=14] -->
   <!-- Text indicating the location of a media item in details window [CHAR LIMIT=14] -->
+  <string name="location">Allugamientu</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">Anchor</string>
   <!-- Text indicating the height of a media item in details window [CHAR LIMIT=14] -->
   <!-- Text indicating the orientation of a media item in details window [CHAR LIMIT=14] -->
+  <string name="orientation">Orientación</string>
   <!-- Text indicating the duration of a video item in details window [CHAR LIMIT=18] -->
   <!-- Text indicating the mime type of a media item in details window [CHAR LIMIT=14] -->
+  <string name="mimetype">Triba MIME</string>
   <!-- Text indicating the file size of a media item in details window [CHAR LIMIT=14] -->
   <!-- Text indicating the maker of a media item in details window [CHAR LIMIT=14] -->
   <!-- Text indicating the model of a media item in details window [CHAR LIMIT=14] -->
diff --git a/res/values-en-rGB/cm_strings.xml b/res/values-en-rGB/cm_strings.xml
index 2f8d3b862..b446dc92e 100644
--- a/res/values-en-rGB/cm_strings.xml
+++ b/res/values-en-rGB/cm_strings.xml
@@ -47,18 +47,30 @@
   <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>
   <!-- Color effects -->
   <string name="pref_camera_coloreffect_entry_cartoonize">Cartoonise</string>
   <!-- Red eye flash mode title -->
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 6e42921c9..8c61ad2c5 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -102,6 +102,7 @@
   <!-- 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] -->
@@ -109,6 +110,7 @@
   <!-- 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] -->
@@ -117,15 +119,25 @@
   <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 -->
   <!-- message for the dialog showing the error of camera hardware -->
   <!-- message for the dialog showing the camera is disabled because of security policies. Camera cannot be used. -->
diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml
index 9c32f20e0..d27a189a6 100644
--- a/res/values-es-rUS/cm_strings.xml
+++ b/res/values-es-rUS/cm_strings.xml
@@ -94,10 +94,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-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index e8af9b4d9..7770bde3c 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -47,6 +47,7 @@
   <string name="pref_camera_scenemode_entry_fireworks">Feux d\'artifice</string>
   <string name="pref_camera_scenemode_entry_flowers">Fleurs</string>
   <string name="pref_camera_scenemode_entry_handheldtwilight">Crépuscule à main levée</string>
+  <string name="pref_camera_scenemode_entry_highsensitivity">Forte sensibilité</string>
   <string name="pref_camera_scenemode_entry_indoor">Intérieur</string>
   <string name="pref_camera_scenemode_entry_landscape">Paysage</string>
   <string name="pref_camera_scenemode_entry_mix_illuminant">Éclairage mixte</string>
diff --git a/res/values-fr/qcomstrings.xml b/res/values-fr/qcomstrings.xml
index 616cef56a..de3ffa4ff 100644
--- a/res/values-fr/qcomstrings.xml
+++ b/res/values-fr/qcomstrings.xml
@@ -399,13 +399,16 @@
   <string name="text_tsmakeup_alert_msg">La détection de visage doit être activée pour utiliser la fonctionnalité d\'embellissement. Souhaitez-vous continuer ?</string>
   <string name="text_tsmakeup_alert_continue">Poursuivre</string>
   <string name="text_tsmakeup_alert_quit">Annuler</string>
+  <string name="text_tsmakeup_beautify_toast">Embellissement</string>
   <string name="all_in_focus">Tout sur le focus</string>
   <string name="refocus_toast">Pour refaire la mise au point, appuyer ici</string>
   <string name="camera_thermal_shutdown">Téléphone en surchauffe, fermeture de l\'appareil photo.</string>
+  <string name="camera_server_died">Arrêt inopiné du serveur multimédia, fermeture de l\'appareil photo.</string>
   <string name="camera_unknown_error">Erreur inconnue, fermeture de l\'appareil photo.</string>
   <!-- Help menu strings -->
   <string name="help_menu_ok">OK</string>
   <string name="help_menu_scene_mode_1">Sélectionnez un</string>
+  <string name="help_menu_scene_mode_2">Mode Scène</string>
   <string name="help_menu_scene_mode_3">pour de meilleures photos</string>
   <string name="help_menu_beautify_1">Améliorer les portraits</string>
   <string name="help_menu_beautify_2">avec la</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f46a15a25..fbae81e1b 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -550,4 +550,5 @@ CHAR LIMIT = NONE] -->
   <string name="setting_wallpaper">Définition du fond d\'écran en cours…</string>
   <!-- Menu, Video rotation labels [CHAR LIMIT=50] -->
   <string name="remaining_photos_format">%d restante(s)</string>
+  <string name="makeup_video_size_limit">Le mode maquillage ne fonctionne que pour les enregistrements vidéos de taille VGA.</string>
 </resources>
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index db3880d47..5ed221849 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -47,6 +47,7 @@
   <string name="pref_camera_scenemode_entry_fireworks">Kembang api</string>
   <string name="pref_camera_scenemode_entry_flowers">Bunga</string>
   <string name="pref_camera_scenemode_entry_handheldtwilight">Genggaman senja</string>
+  <string name="pref_camera_scenemode_entry_highsensitivity">Sensitivitas tinggi</string>
   <string name="pref_camera_scenemode_entry_indoor">Di dalam ruangan</string>
   <string name="pref_camera_scenemode_entry_landscape">Lanskap</string>
   <string name="pref_camera_scenemode_entry_mix_illuminant">Pencahayaan campuran</string>
diff --git a/res/values-nb/qcomstrings.xml b/res/values-nb/qcomstrings.xml
index 8c8112ab6..ec88753e0 100644
--- a/res/values-nb/qcomstrings.xml
+++ b/res/values-nb/qcomstrings.xml
@@ -405,7 +405,6 @@
   <string name="refocus_toast">For å re-fokusere det siste bildet, trykk her</string>
   <string name="refocus_prompt_message">Med UbiFocus tar kameraet 5 bilder hver gang du trykker på utløserknappen. 5 bilder kombineres i 1 bilde, der alt er i fokus. Du kan velge å re-fokusere, etter at du tar bildet.</string>
   <string name="camera_thermal_shutdown">Telefon overopphetet, kameraet lukkes.</string>
-  <string name="camera_server_died">Medieserveren døde, kameraet lukkes.</string>
   <string name="camera_unknown_error">Ukjent feil, kameraet lukkes.</string>
   <string name="mute_button_desc">Dempe-knapp</string>
   <!-- Help menu strings -->
diff --git a/res/values-pl/qcomstrings.xml b/res/values-pl/qcomstrings.xml
index 4ab7d114e..ca4f47f97 100644
--- a/res/values-pl/qcomstrings.xml
+++ b/res/values-pl/qcomstrings.xml
@@ -341,6 +341,7 @@
   <string name="all_in_focus">Wszystko wyostrzone</string>
   <string name="refocus_toast">Dotknij tutaj, aby zmienić ostrość ostatniego zdjęcia</string>
   <!-- Help menu strings -->
+  <string name="help_menu_ok">OK</string>
   <string name="pref_camera2_mono_preview_entry_off">Wyłączona</string>
   <string name="pref_camera2_clearsight_entry_off">Wyłączona</string>
   <string name="pref_camera2_mpo_entry_off">Wyłączona</string>
@@ -348,5 +349,6 @@
   <string name="pref_camera2_noise_reduction_entry_fast">Szybka</string>
   <string name="pref_camera2_videosnap_entry_enable">Wł.</string>
   <string name="pref_camera2_videosnap_entry_disable">Wył.</string>
+  <string name="pref_camera2_trackingfocus_title">Śledzenie ostrości</string>
   <string name="pref_camera2_shutter_sound_entry_off">Wyłączona</string>
 </resources>
diff --git a/res/values-sl/qcomstrings.xml b/res/values-sl/qcomstrings.xml
index 34b003549..a7c161f4d 100644
--- a/res/values-sl/qcomstrings.xml
+++ b/res/values-sl/qcomstrings.xml
@@ -192,7 +192,7 @@
   <!-- Settings screen, Select hfr title -->
   <string name="pref_camera_hfr_title">Počasni posnetek</string>
   <!-- Settings screen, hfr radio button choices -->
-  <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>
@@ -428,14 +428,14 @@
   <string name="pref_camera2_camera2_entry_disable">Onemogoči</string>
   <string name="pref_camera2_mono_only_title">Samo mono</string>
   <string name="pref_camera2_mono_preview_title">Predogled mono</string>
-  <string name="pref_camera2_mono_preview_entry_on">Vkl.</string>
+  <string name="pref_camera2_mono_preview_entry_on">Vklopljeno</string>
   <string name="pref_camera2_mono_preview_entry_off">Izklopljeno</string>
-  <string name="pref_camera2_clearsight_entry_on">Vkl.</string>
+  <string name="pref_camera2_clearsight_entry_on">Vklopljeno</string>
   <string name="pref_camera2_clearsight_entry_off">Izklopljeno</string>
   <string name="clearsight_capture_success">Zajem ClearSight je bil upešen</string>
   <string name="clearsight_capture_fail">Zajem ClearSight je spodletel</string>
   <string name="pref_camera2_mpo_title">Oblika MPO-ja</string>
-  <string name="pref_camera2_mpo_entry_on">Vkl.</string>
+  <string name="pref_camera2_mpo_entry_on">Vklopljeno</string>
   <string name="pref_camera2_mpo_entry_off">Izklopljeno</string>
   <string name="pref_camera2_makeup_title">Ličilo</string>
   <string name="pref_camera2_noise_reduction_title">Zmanjševanje šuma</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index b2fc6354e..6c5d479b4 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -174,7 +174,7 @@
   <!-- Text followed by a checkbox to turn on/off sound effects during the countdown. [CHAR LIMIT = 24]-->
   <string name="pref_camera_timer_sound_title">Tiếng bíp khi đếm ngược</string>
   <!-- Entry of camera save path -->
-  <string name="pref_camera_savepath_title">Bộ nhớ</string>
+  <string name="pref_camera_savepath_title">Lưu trữ</string>
   <string name="pref_camera_savepath_entry_0">Điện thoại</string>
   <string name="pref_camera_savepath_entry_1">Thẻ SD</string>
   <!-- Entry of a on/off setting. The setting is turned off. [CHAR LIMIT=15] -->