3 files changed, 24 insertions, 22 deletions
diff --git a/res/values-in/camera2arrays.xml b/res/values-in/camera2arrays.xml
index 30b65ca7c..5f430cd69 100644
--- a/res/values-in/camera2arrays.xml
+++ b/res/values-in/camera2arrays.xml
@@ -29,8 +29,8 @@
 -->
 <resources>
   <string-array name="pref_camera2_mono_only_entries">
-    <item>Aktif</item>
-    <item>Nonaktif</item>
+    <item>Hidup</item>
+    <item>Mati</item>
   </string-array>
   <string-array name="pref_camera2_initial_camera_entries">
     <item>Bayer</item>
@@ -38,12 +38,12 @@
     <item>Depan</item>
   </string-array>
   <string-array name="pref_camera2_makeup_entries">
-    <item>Aktif</item>
-    <item>Nonaktif</item>
+    <item>Hidup</item>
+    <item>Mati</item>
   </string-array>
   <string-array name="pref_camera2_trackingfocus_entries">
-    <item>Aktif</item>
-    <item>Nonaktif</item>
+    <item>Hidup</item>
+    <item>Mati</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-in/qcomstrings.xml b/res/values-in/qcomstrings.xml
index cd8ba44cc..e9814243c 100644
--- a/res/values-in/qcomstrings.xml
+++ b/res/values-in/qcomstrings.xml
@@ -55,8 +55,8 @@
   <!-- Settings screen, Select Skin Tone Enhancement title -->
   <string name="pref_camera_skinToneEnhancement_title">Perbaikan warna kulit</string>
   <!-- Settings screen, Skin Tone Enhancement radio button choices -->
-  <string name="pref_camera_skinToneEnhancement_entry_enable">Hidupkan</string>
-  <string name="pref_camera_skinToneEnhancement_entry_disable">Matikan</string>
+  <string name="pref_camera_skinToneEnhancement_entry_enable">Hidup</string>
+  <string name="pref_camera_skinToneEnhancement_entry_disable">Mati</string>
   <!-- Skin Tone Enhancement entry values. Do not translate. -->
   <!-- Settings screen, setting title text for ZSL-->
   <string name="pref_camera_zsl_title">Rana tanpa jeda</string>
@@ -92,10 +92,10 @@
   <string name="pref_camera_manual_focus_entry_diopter_mode">Modus Diopter</string>
   <string name="pref_camera_manual_focus_entry_off">Tidak aktif</string>
   <!-- Instant Capture entry -->
-  <string name="pref_camera_instant_capture_title" translatable="true">Ambil foto instan</string>
+  <string name="pref_camera_instant_capture_title" translatable="true">Tangkapan instant</string>
   <string name="pref_camera_instant_capture_entry_aggressive_aec" translatable="true">AEC agresif</string>
   <string name="pref_camera_instant_capture_entry_fast_aec" translatable="true">AEC cepat</string>
-  <string name="pref_camera_instant_capture_entry_disable" translatable="true">Matikan</string>
+  <string name="pref_camera_instant_capture_entry_disable" translatable="true">Mati</string>
   <!-- Instant Capture entry values -->
   <!-- Settings screen, ZSL location dialog choices -->
   <string name="pref_camera_zsl_entry_off">Tidak aktif</string>
@@ -115,12 +115,12 @@
   <string name="pref_camera_video_cds_entry_on">Hidup</string>
   <string name="pref_camera_video_cds_entry_auto">Secara otomatis</string>
   <!-- Settings screen, TNR location dialog choices -->
-  <string name="pref_camera_tnr_entry_disable">Matikan</string>
-  <string name="pref_camera_tnr_entry_enable">Hidupkan</string>
+  <string name="pref_camera_tnr_entry_disable">Mati</string>
+  <string name="pref_camera_tnr_entry_enable">Hidup</string>
   <!-- Settings screen, TNR location dialog choices -->
   <!-- Settings screen, video TNR location dialog choices -->
-  <string name="pref_camera_video_tnr_entry_disable">Nonaktifkan</string>
-  <string name="pref_camera_video_tnr_entry_enable">Hidupkan</string>
+  <string name="pref_camera_video_tnr_entry_disable">Mati</string>
+  <string name="pref_camera_video_tnr_entry_enable">Hidup</string>
   <!-- Settings screen, video TNR location dialog choices -->
   <!-- Settings screen, setting title text for Video HDR-->
   <string name="pref_camera_video_hdr_title">Video HDR</string>
@@ -152,10 +152,10 @@
   <!-- Settings screen, Select Redeye Reduction -->
   <string name="pref_camera_redeyereduction_title">Penurunan mata merah</string>
   <!-- Settings menu, redeye reduction choices -->
-  <string name="pref_camera_redeyereduction_entry_enable">Hidupkan</string>
-  <string name="pref_camera_redeyereduction_entry_disable">Nonaktifkan</string>
-  <string name="pref_camera_selfiemirror_entry_enable">Hidupkan</string>
-  <string name="pref_camera_selfiemirror_entry_disable">Matikan</string>
+  <string name="pref_camera_redeyereduction_entry_enable">Hidup</string>
+  <string name="pref_camera_redeyereduction_entry_disable">Mati</string>
+  <string name="pref_camera_selfiemirror_entry_enable">Hidup</string>
+  <string name="pref_camera_selfiemirror_entry_disable">Mati</string>
   <string name="pref_camera_shuttersound_title" translatable="true">Suara rana</string>
   <string name="pref_camera_shuttersound_entry_enable">Dihidupkan</string>
   <string name="pref_camera_shuttersound_entry_disable">Dimatikan</string>
@@ -396,6 +396,7 @@
   <string name="refocus_toast">Untuk fokus kembali pada foto yang terakhir, tekan di sini</string>
   <string name="refocus_prompt_message">Dengan UbiFocus, kamera akan mengambil lima foto, setiap kali Anda menekan tombol rana. Kelima foto tersebut akan digabungkan menjadi satu foto, yang semuanya dalam fokus. Anda bisa memfokuskan ulang, setelah mengambil foto.</string>
   <string name="camera_thermal_shutdown">Telepon terlalu panas, menutup kamera.</string>
+  <string name="camera_server_died">Server media mati, menutup kamera.</string>
   <string name="camera_unknown_error">Terjadi kesalahan, menutup kamera.</string>
   <!-- Help menu strings -->
   <string name="help_menu_ok">OKE</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 5ff6c51d8..1408d0c01 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -302,17 +302,17 @@ Gambar yang dipotong disimpan ke <xliff:g id="folder_name">%s</xliff:g>.</string
   <!-- Toast after enable 2k4k video quality to inform IS has disabled -->
   <string name="video_quality_4k_disable_IS">Kualitas video 4k akan menonaktifkan kestabilan gambar.</string>
   <!-- Toast after 2k4k video is enabled to inform SeeMore has been disabled -->
-  <string name="video_quality_4k_disable_SeeMore">SeeMore tidak dapat diaktifkan selama video 4k.</string>
+  <string name="video_quality_4k_disable_SeeMore">Pandangan lebih lanjut tidak dapat diaktifkan selama video 4k.</string>
   <!-- Toast after High Quality Noise Reduction has been enabled to show CDS is disabled -->
   <string name="disable_CDS_during_HighQualityNoiseReduction">Pengurangan kebisingan berkualitas tinggi akan mematikan CDS.</string>
   <!-- Toast after High Quality Noise Reduction has been enabled to show TNR is disabled -->
   <string name="disable_TNR_during_HighQualityNoiseReduction">Pengurangan kebisingan berkualitas tinggi akan mematikan TNR.</string>
   <!-- Toast after SeeMore has been enabled to show CDS is disabled -->
-  <string name="disable_CDS_during_SeeMore">SeeMore akan menonaktifkan CDS.</string>
+  <string name="disable_CDS_during_SeeMore">Pandangan lebih lanjut akan menonaktifkan CDS.</string>
   <!-- Toast after SeeMore has been enabled to show TNR is disabled -->
-  <string name="disable_TNR_during_SeeMore">SeeMore akan menonaktifkan TNR.</string>
+  <string name="disable_TNR_during_SeeMore">Pandangan lebih lanjut akan menonaktifkan TNR.</string>
   <!-- Toast after SeeMore has been enabled to show NR is disabled -->
-  <string name="disable_NR_during_SeeMore">SeeMore akan mematikan pengurangan kebisingan.</string>
+  <string name="disable_NR_during_SeeMore">Pandangan lebih lanjut akan mematikan pengurangan kebisingan.</string>
   <!-- Exposure settings in preference -->
   <string name="pref_exposure_title">Pencahayaan</string>
   <!--  menu label exposure compensation [CHAR LIMIT=50] -->
@@ -545,4 +545,5 @@ CHAR LIMIT = NONE] -->
   <string name="setting_wallpaper">Setel wallpaper</string>
   <!-- Menu, Video rotation labels [CHAR LIMIT=50] -->
   <string name="remaining_photos_format">%d tersisa</string>
+  <string name="makeup_video_size_limit">Makeup hanya bekerja dibawah ukuran VGA di perekam video.</string>
 </resources>