Automatic translation import

Change-Id: Idd699c976b633e85f815189d918194201977aa6b

10 files changed, 109 insertions, 9 deletions

diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index e25adc394..5ffe9a0b2 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -156,6 +156,7 @@
   <!-- Toast after enable HDR function to inform Continuous Shot has disabled -->
   <!-- Toast after enable Advanced Capture function to inform Continuous Shot has disabled -->
   <!-- Toast after enable 2k4k video quality to inform IS has disabled -->
+  <string name="video_quality_4k_disable_IS">4k video quality will disable image stabilisation.</string>
   <!-- Toast after 2k4k video is enabled to inform SeeMore has been disabled -->
   <!-- Toast after High Quality Noise Reduction has been enabled to show CDS is disabled -->
   <!-- Toast after High Quality Noise Reduction has been enabled to show TNR is disabled -->
diff --git a/res/values-en-rGB/camera2arrays.xml b/res/values-en-rGB/camera2arrays.xml
index c5b0b7a8f..f143df608 100644
--- a/res/values-en-rGB/camera2arrays.xml
+++ b/res/values-en-rGB/camera2arrays.xml
@@ -28,6 +28,10 @@
      IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 <resources>
+  <string-array name="pref_camera2_mono_only_entries">
+    <item>On</item>
+    <item>Off</item>
+  </string-array>
   <!-- Refer to CONTROL_SCENE_MODE of Camera2 API for values
         -1 refers to ones not supported in Camera2 API
         0 is special case added for auto (meaning off)
diff --git a/res/values-en-rGB/cm_strings.xml b/res/values-en-rGB/cm_strings.xml
index ebca1dc44..e89801ff7 100644
--- a/res/values-en-rGB/cm_strings.xml
+++ b/res/values-en-rGB/cm_strings.xml
@@ -18,13 +18,19 @@
 <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">(%1$s) %2$1.1f megapixels</string>
   <!-- Settings screen, scene mode -->
+  <string name="pref_camera_scenemode_entry_aqua">Aqua</string>
+  <string name="pref_camera_scenemode_entry_asd">Best shot</string>
+  <string name="pref_camera_scenemode_entry_fallcolor">Autumn</string>
   <!-- Settings screen, focus mode -->
   <!-- Color effects -->
+  <string name="pref_camera_coloreffect_entry_cartoonize">Cartoonise</string>
   <!-- Red eye flash mode title -->
   <!-- Power shutter -->
   <!-- Max brightness -->
diff --git a/res/values-en-rGB/qcomstrings.xml b/res/values-en-rGB/qcomstrings.xml
index eb31e645f..434de5ad6 100644
--- a/res/values-en-rGB/qcomstrings.xml
+++ b/res/values-en-rGB/qcomstrings.xml
@@ -26,17 +26,25 @@
   <!-- 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">Power mode</string>
   <!-- Settings screen, Power mode dialog radio button choices -->
+  <string name="pref_camera_powermode_entry_lp">Low power</string>
+  <string name="pref_camera_powermode_entry_np">Normal power</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 exposure</string>
   <!-- Settings screen, auto exposure dialog radio button choices -->
+  <string name="pref_camera_autoexposure_entry_frameaverage">Frame average</string>
+  <string name="pref_camera_autoexposure_entry_centerweighted">Centre weighted</string>
   <!-- Auto exposure entry values. Do not translate. -->
   <!-- Settings screen, Video encoder title -->
+  <string name="pref_camera_videoencoder_title">Video codec</string>
   <!-- Settings screen, Video encoder dialog radio button choices -->
   <!-- Default video encoder setting. A numerical value. -->
   <!-- Settings screen, Video encoder dialog title -->
+  <string name="pref_camera_videoencoder_dialogtitle">Video codec</string>
   <!-- Default audio encoder setting. A numerical value. -->
   <!-- Settings screen, Audio encoder title -->
   <!-- Settings screen, Audio encoder dialog radio button choices -->
@@ -46,15 +54,18 @@
   <!-- Settings screen, Skin Tone Enhancement radio button choices -->
   <!-- Skin Tone Enhancement entry values. Do not translate. -->
   <!-- Settings screen, setting title text for ZSL-->
+  <string name="pref_camera_zsl_title">Zero shutter lag</string>
   <!-- Default selectable zone af setting. Do not translate. -->
   <!-- Settings screen, Selectable zone af title -->
   <!-- Settings screen, Selectable Zone Af dialog radio button choices -->
+  <string name="pref_camera_selectablezoneaf_entry_centerweighted">Centre weighted</string>
   <!-- Auto exposure entry values. Do not translate. -->
   <!-- Settings screen, Selectable advanced features title -->
   <!-- Settings screen, Selectable Zone Af dialog radio button choices -->
   <!-- Auto exposure entry values. Do not translate. -->
   <!-- Manual exposure control entry values -->
   <!-- Manual white balance entry values -->
+  <string name="pref_camera_manual_wb_entry_color_temperature">Colour temperature</string>
   <!-- Manual Focus entry values -->
   <!-- Instant Capture entry -->
   <!-- Instant Capture entry values -->
@@ -96,7 +107,9 @@
   <!--The message is shown in dialog when the raw snapshot is selected in zsl mode-->
   <!-- Settings screen, AE bracketing and HDR location dialog choices -->
   <!-- The messsage shown if user selects a snapshot resolution lower than the current video size. -->
+  <string name="snapshot_lower_than_video">Video snapshot size is lower than video size, capping to video size. Please select a resolution higher or equal to the current video size.</string>
   <!-- The messsage shown if user selects a snapshot resolution in low power mode. -->
+  <string name="snapshotsize_low_powermode">Changing picture size is not supported in Low Power mode, video size snapshot will be taken. Please select Normal Power mode to allow changing picture size.</string>
   <!-- The messsage shown if user tries to take snapshot during D1/QCIF resolution. -->
   <!-- Default hfr setting. Do not translate. -->
   <!-- Settings screen, Select hfr title -->
@@ -121,8 +134,12 @@
   <!-- Settings screen, Anti Banding entries -->
   <!-- Default color effect setting. -->
   <!-- Settings screen, Select Color effect title -->
+  <string name="pref_camera_coloreffect_title">Colour effect</string>
+  <string name="pref_camera_filter_mode_title">Colour effect</string>
   <!-- Settings screen, Color effect dialog radio button choices -->
   <!-- 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>
   <!-- Settings screen, Touch AF/AEC dialog radio button choices -->
   <!-- Select IS title -->
   <!-- DIS choices -->
@@ -153,6 +170,7 @@
   <!-- Settings menu, auto scene detection choices -->
   <!-- Scene detection set to on - supports backlight and snow cloudy detection. -->
   <!-- Toast showing error if invalid size selected for  time lapse  [CHAR LIMIT=65] -->
+  <string name="time_lapse_error">Invalid video-size for time-lapse recording.</string>
   <!-- longshot value -->
   <!-- Toast showing non-supported functionality for flash in AE bracket -->
   <!-- Settings screen, setting title text for Auto HDR-->
@@ -174,4 +192,5 @@
   <!-- Advanced features enable message -->
   <!-- The alas of CameraActivity for gesture operation -->
   <!-- Help menu strings -->
+  <string name="help_menu_color_filter_1">Apply colour</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index e25adc394..7d751cacb 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -16,15 +16,29 @@
 -->
 <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>
   <!-- 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="details">Details</string>
   <!-- String indicating how many media item(s) is(are) selected
             eg. 1 selected [CHAR LIMIT=30] -->
   <!-- String indicating how many media album(s) is(are) selected
@@ -51,6 +65,7 @@
   <!-- Text indicating the duration of a video item in details window [CHAR LIMIT=18] -->
   <!-- Text indicating the mime type of a media item in details window [CHAR LIMIT=14] -->
   <!-- Text indicating the file size of a media item in details window [CHAR LIMIT=14] -->
+  <string name="file_size">File size</string>
   <!-- Text indicating the maker of a media item in details window [CHAR LIMIT=14] -->
   <!-- Text indicating the model of a media item in details window [CHAR LIMIT=14] -->
   <!-- Text indicating flash info of a media item in details window [CHAR LIMIT=14] -->
@@ -110,6 +125,7 @@
   <!-- Settings screen, Camera setting category title -->
   <!-- Settings screen, Camcorder setting category title -->
   <!-- Settings screen, Picture size title -->
+  <string name="pref_camera_picturesize_title">Picture size</string>
   <!-- Settings screen, Focus mode title -->
   <!-- Settings screen, Focus mode dialog radio button choices -->
   <!-- A setting that lets the camera focus into infinity. [CHAR LIMIT=20] -->
@@ -175,6 +191,7 @@
   <!-- 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] -->
   <!-- The text shown in the progress dialog when panorama preview is generating in the background [CHAR LIMIT=30] -->
   <!-- The text shown in the dialog when panorama saving failed [CHAR LIMIT=40] -->
@@ -212,6 +229,7 @@
   <!-- The button to switch to the Photo Sphere mode. [CHAR LIMIT = NONE] -->
   <!-- The button to switch to the high quality mode. [CHAR LIMIT = NONE] -->
   <!-- The button in review mode indicating that the photo taking, video recording, and panorama saving session should be canceled [CHAR LIMIT = NONE] -->
+  <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] -->
   <!-- button in review mode indicate the user want to retake another photo/video for attachment [
 CHAR LIMIT = NONE] -->
@@ -283,4 +301,5 @@ CHAR LIMIT = NONE] -->
   <!-- Label for album filmstrip button -->
   <!--  String shown when setting the homepage wallpaper in the background [CHAR LIMIT=NONE] -->
   <!-- Menu, Video rotation labels [CHAR LIMIT=50] -->
+  <string name="makeup_video_size_limit">Makeup works only under VGA size in video recording.</string>
 </resources>
diff --git a/res/values-nl/qcomstrings.xml b/res/values-nl/qcomstrings.xml
index 6b74fdeda..f1975305e 100644
--- a/res/values-nl/qcomstrings.xml
+++ b/res/values-nl/qcomstrings.xml
@@ -166,13 +166,13 @@
   <!-- The message is shown in dialog when the app encounters an unsupported resolution for HFR 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 DIS 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 HSR 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 app encounters an unsupported video profile-->
   <string name="error_app_unsupported_profile">Niet-ondersteund videoformaat</string>
   <!--The message is shown in dialog when the raw snapshot is selected in zsl mode-->
@@ -399,7 +399,7 @@
   <string name="text_tsmakeup_alert_quit">Annuleren</string>
   <string name="text_tsmakeup_beautify_toast">Verfraaien</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>
   <string name="refocus_prompt_message">Met UbiFocus maakt uw camera 5 foto\'s, elke keer als u op de sluiterknop drukt. De 5 foto\'s zullen worden samengevoegd tot 1 afbeelding, waarop alles in focus is. U kunt de focus nog verplaatsen, nadat de foto genomen is.</string>
   <string name="camera_thermal_shutdown">Telefoon oververhit, camera wordt afgesloten.</string>
   <string name="camera_server_died">Mediaserver gecrasht, camera wordt gestopt.</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index d7920efa3..319e8ee92 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -306,9 +306,9 @@
   <!-- Toast after enable Advanced Capture function to inform Continuous Shot has disabled -->
   <string name="advanced_capture_disable_continuous_shot">Geavanceerd vastleggen zal continue opname uitschakelen.</string>
   <!-- Toast after enable 2k4k video quality to inform IS has disabled -->
-  <string name="video_quality_4k_disable_IS">Beeldstabilisatie wordt uitgeschakeld bij 4K-video-opname.</string>
+  <string name="video_quality_4k_disable_IS">Beeldstabilisatie wordt uitgeschakeld bij 4K-video.</string>
   <!-- Toast after 2k4k video is enabled to inform SeeMore has been disabled -->
-  <string name="video_quality_4k_disable_SeeMore">SeeMore kan niet worden ingeschakeld tijdens 4K-video.</string>
+  <string name="video_quality_4k_disable_SeeMore">SeeMore wordt uitgeschakeld bij bij 4K-video.</string>
   <!-- Toast after High Quality Noise Reduction has been enabled to show CDS is disabled -->
   <string name="disable_CDS_during_HighQualityNoiseReduction">Ruisonderdrukking van hoge kwaliteit zal CDS uitschakelen.</string>
   <!-- Toast after High Quality Noise Reduction has been enabled to show TNR is disabled -->
@@ -412,12 +412,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-sv/camera2arrays.xml b/res/values-sv/camera2arrays.xml
index e4799e030..dbe7c9e43 100644
--- a/res/values-sv/camera2arrays.xml
+++ b/res/values-sv/camera2arrays.xml
@@ -32,6 +32,15 @@
     <item>På</item>
     <item>Av</item>
   </string-array>
+  <string-array name="pref_camera2_initial_camera_entries">
+    <item>Bayer</item>
+    <item>Mono</item>
+    <item>Front</item>
+  </string-array>
+  <string-array name="pref_camera2_trackingfocus_entries">
+    <item>På</item>
+    <item>Av</item>
+  </string-array>
   <!-- Refer to CONTROL_SCENE_MODE of Camera2 API for values
         -1 refers to ones not supported in Camera2 API
         0 is special case added for auto (meaning off)
diff --git a/res/values-sv/qcomstrings.xml b/res/values-sv/qcomstrings.xml
index 3223639b8..7312e1b2e 100644
--- a/res/values-sv/qcomstrings.xml
+++ b/res/values-sv/qcomstrings.xml
@@ -27,6 +27,7 @@
   <!-- Video quality setting entry. Videos will be recorded in QCIF quality. [CHAR LIMIT=24] -->
   <!-- Settings screen, Power Mode title -->
   <!-- Settings screen, Power mode dialog radio button choices -->
+  <string name="pref_camera_powermode_entry_lp">Låg energi</string>
   <!-- Settings screen, Power mode dialog radio button choices -->
   <!-- Default Power mode.. -->
   <!-- Default auto exposure setting. Do not translate. -->
@@ -203,6 +204,7 @@
   <string name="pref_camera_antibanding_entry_2">60 Hz (USA)</string>
   <string name="pref_camera_antibanding_entry_3">Auto</string>
   <!-- Default color effect setting. -->
+  <string name="pref_camera_filter_mode_entry_on">På</string>
   <string name="pref_camera_filter_mode_entry_off">Av</string>
   <!-- Settings screen, Select Color effect title -->
   <string name="pref_camera_coloreffect_title">Färgeffekt</string>
@@ -226,14 +228,17 @@
   <string name="pref_camera_coloreffect_entry_greentint">Grön toning</string>
   <!-- Settings screen, Touch AF/AEC dialog radio button choices -->
   <string name="pref_camera_touchafaec_entry_off">Av</string>
+  <string name="pref_camera_touchafaec_entry_on">På</string>
   <!-- Select IS title -->
   <string name="pref_camera_dis_title">Stabilisering</string>
   <!-- DIS choices -->
   <string name="pref_camera_dis_entry_off">Av</string>
+  <string name="pref_camera_dis_entry_on">På</string>
   <!-- Select Face Recognition title -->
   <string name="pref_camera_facerc_title">Ansiktsigenkänning</string>
   <!-- Face Recognition choices -->
   <string name="pref_camera_facerc_entry_off">Av</string>
+  <string name="pref_camera_facerc_entry_on">På</string>
   <!-- Settings screen, Multiple levels entries -->
   <string name="pref_camera_sharpness_entry_level0">Nivå 0</string>
   <string name="pref_camera_sharpness_entry_level1">Nivå 1</string>
@@ -284,10 +289,15 @@
   <!-- Settings screen, Picture quality title -->
   <string name="pref_camera_jpegquality_title">Bildkvalitet</string>
   <!-- Settings screen, Picture quality dialog radio button choices -->
+  <string name="pref_camera_jpegquality_entry_0">Låg</string>
+  <string name="pref_camera_jpegquality_entry_1">Standard</string>
+  <string name="pref_camera_jpegquality_entry_2">Hög</string>
   <!-- Default auto histogram setting. Do not translate. -->
   <!-- Settings screen, Select Histogram title -->
   <string name="pref_camera_histogram_title">Histogram</string>
   <!-- Settings screen, Histogram radio button choices -->
+  <string name="pref_camera_histogram_entry_enable">Aktivera</string>
+  <string name="pref_camera_histogram_entry_disable">Avaktivera</string>
   <!-- Histogram entry values. Do not translate. -->
   <!-- Default auto scene detection setting. -->
   <!-- Settings screen, Select Auto Scene Detection -->
@@ -295,6 +305,7 @@
   <!-- Settings menu, auto scene detection choices -->
   <string name="pref_camera_scenedetect_entry_off">Av</string>
   <!-- Scene detection set to on - supports backlight and snow cloudy detection. -->
+  <string name="pref_camera_scenedetect_entry_on">På</string>
   <!-- Toast showing error if invalid size selected for  time lapse  [CHAR LIMIT=65] -->
   <!-- longshot value -->
   <string name="pref_camera_longshot_title">Kontinuerlig bildtagning</string>
@@ -304,6 +315,8 @@
   <!-- Settings screen, setting title text for Auto HDR-->
   <string name="pref_camera_auto_hdr_title">Auto HDR</string>
   <!-- Settings screen, Auto HDR location dialog choices -->
+  <string name="pref_camera_auto_hdr_entry_enable">Aktivera</string>
+  <string name="pref_camera_auto_hdr_entry_disable">Avaktivera</string>
   <!-- toast message for storage location switch -->
   <string name="on_switch_save_path_to_sdcard">Det finns inte tillräckligt internt lagringsutrymme, bytte lagringsplats till SD-kort</string>
   <!-- Settings screen, Selectable HDR mode title -->
@@ -321,6 +334,7 @@
   <!--Settings screen, video rotation title-->
   <string name="pref_camera_video_rotation_title">Videorotation</string>
   <!--Menu, video rotation label-->
+  <string name="pref_camera_video_rotation_label">VIDEO ROTATION</string>
   <!-- Settings screen, Video rotation dialog radio button choices -->
   <string name="pref_camera_video_rotation_entry_0">0 grader</string>
   <string name="pref_camera_video_rotation_entry_90">90 grader</string>
@@ -334,13 +348,41 @@
   <string name="advance_feature_enable_msg">Kontinuerlig bildtagning stöds inte när avancerade funktioner är aktiverade</string>
   <!-- The alas of CameraActivity for gesture operation -->
   <string name="camera_gesture_title">Starta kamera</string>
+  <string name="pref_camera_tsmakeup_entry_on">På</string>
   <string name="pref_camera_tsmakeup_entry_off">Av</string>
+  <string name="pref_camera_tsmakeup_entry_low">Låg</string>
+  <string name="pref_camera_tsmakeup_entry_mid">Medium</string>
+  <string name="pref_camera_tsmakeup_entry_high">Hög</string>
+  <string name="pref_camera_tsmakeup_custom">Anpassad</string>
+  <string name="text_tsmakeup_alert_title">Varning</string>
+  <string name="text_tsmakeup_alert_continue">Fortsätt</string>
+  <string name="text_tsmakeup_alert_quit">Avbryt</string>
   <string name="all_in_focus">Allt i fokus</string>
   <string name="refocus_toast">För att återfokusera senaste bilden, klicka här</string>
   <!-- Help menu strings -->
+  <string name="help_menu_ok">OK</string>
+  <string name="help_menu_color_filter_2">filter</string>
+  <string name="help_menu_color_filter_3">till</string>
+  <string name="help_menu_switcher_1">Byt till</string>
+  <string name="help_menu_switcher_2">mellan</string>
+  <string name="pref_camera2_camera2_entry_enable">Aktivera</string>
+  <string name="pref_camera2_camera2_entry_disable">Avaktivera</string>
+  <string name="pref_camera2_mono_only_title">Endast mono</string>
+  <string name="pref_camera2_mono_preview_entry_on">På</string>
   <string name="pref_camera2_mono_preview_entry_off">Av</string>
+  <string name="pref_camera2_clearsight_entry_on">På</string>
   <string name="pref_camera2_clearsight_entry_off">Av</string>
+  <string name="pref_camera2_mpo_entry_on">På</string>
   <string name="pref_camera2_mpo_entry_off">Av</string>
+  <string name="pref_camera2_noise_reduction_title">Brusreducering</string>
   <string name="pref_camera2_noise_reduction_entry_off">Av</string>
+  <string name="pref_camera2_noise_reduction_entry_fast">Snabb</string>
+  <string name="pref_camera2_noise_reduction_entry_high_quality">Hög kvalite</string>
+  <string name="pref_camera2_videosnap_entry_enable">Aktivera</string>
+  <string name="pref_camera2_videosnap_entry_disable">Avaktivera</string>
+  <string name="pref_camera_scenemode_entry_bestpicture">Bästa bild</string>
+  <string name="bestpicture_done">KLAR</string>
+  <string name="bestpicture_at_least_one_picture">Minst en bild måste väljas.</string>
+  <string name="pref_camera2_shutter_sound_entry_on">På</string>
   <string name="pref_camera2_shutter_sound_entry_off">Av</string>
 </resources>
diff --git a/res/values-uk/qcomstrings.xml b/res/values-uk/qcomstrings.xml
index f53695ab9..18b9e284a 100644
--- a/res/values-uk/qcomstrings.xml
+++ b/res/values-uk/qcomstrings.xml
@@ -395,7 +395,7 @@
   <string name="pref_camera_tsmakeup_entry_high">Високе</string>
   <string name="pref_camera_tsmakeup_custom">Користувацьке</string>
   <string name="pref_camera_tsmakeup_level_whiten">Відбілювання</string>
-  <string name="pref_camera_tsmakeup_level_clean">М\'ягко</string>
+  <string name="pref_camera_tsmakeup_level_clean">М\'яко</string>
   <string name="text_tsmakeup_alert_title">Попередження</string>
   <string name="text_tsmakeup_alert_msg">Для використання функції прикрашання має бути увімкнуто розпізнавання облич. Ви хочете продовжити?</string>
   <string name="text_tsmakeup_alert_continue">Продовжити</string>