merge in oc-release history after reset to master
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 1bec58e..c683c3d 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -43,7 +43,7 @@
     <string name="rotate" msgid="460017689320955494">"Putar"</string>
     <string name="rotate_left" msgid="5888273317282539839">"Putar ke kiri"</string>
     <string name="rotate_right" msgid="6776325835923384839">"Putar ke kanan"</string>
-    <string name="slide_show" msgid="1965192737233824143">"Rangkai slide"</string>
+    <string name="slide_show" msgid="1965192737233824143">"Slideshow"</string>
     <string name="multiselect" msgid="4761682939945434146">"Pilih banyak"</string>
     <string name="capture_picture" msgid="4114265595549284643">"Ambil gambar"</string>
     <string name="capture_video" msgid="4047046282358697155">"Ambil video"</string>
@@ -67,7 +67,7 @@
     <string name="camera_pick_wallpaper" msgid="7026385960511811641">"Gambar"</string>
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"Wallpaper"</string>
     <string name="pref_gallery_category" msgid="5826488887237959433">"Setelan umum"</string>
-    <string name="pref_slideshow_category" msgid="9097962086335681667">"Setelan rangkai slide"</string>
+    <string name="pref_slideshow_category" msgid="9097962086335681667">"Setelan slideshow"</string>
     <string name="pref_gallery_size_title" msgid="1363406603879434418">"Tampilkan ukuran"</string>
     <string name="pref_gallery_size_summary" msgid="7365675768755956361">"Pilih ukuran tampilan gambar dan video"</string>
     <string name="pref_gallery_size_dialogtitle" msgid="757380558320647503">"Ukuran gambar"</string>
@@ -82,25 +82,25 @@
     <item msgid="5546009539334018063">"Terbaru lebih dulu"</item>
     <item msgid="7931283047572866748">"Terbaru terakhir"</item>
   </string-array>
-    <string name="pref_gallery_slideshow_interval_title" msgid="6534904787962619832">"Interval rangkai slide"</string>
+    <string name="pref_gallery_slideshow_interval_title" msgid="6534904787962619832">"Interval slideshow"</string>
     <string name="pref_gallery_slideshow_interval_summary" msgid="25973922639324614">"Pilih berapa lama masing-masing slide ditampilkan"</string>
-    <string name="pref_gallery_slideshow_interval_dialogtitle" msgid="6775543119826248900">"Interval rangkai slide"</string>
+    <string name="pref_gallery_slideshow_interval_dialogtitle" msgid="6775543119826248900">"Interval slideshow"</string>
   <string-array name="pref_gallery_slideshow_interval_choices">
     <item msgid="3089037742117543119">"2 detik"</item>
     <item msgid="738579316565625730">"3 detik"</item>
     <item msgid="5670078787463530498">"4 detik"</item>
   </string-array>
-    <string name="pref_gallery_slideshow_transition_title" msgid="3235158556228218846">"Transisi rangkai slide"</string>
+    <string name="pref_gallery_slideshow_transition_title" msgid="3235158556228218846">"Transisi slideshow"</string>
     <string name="pref_gallery_slideshow_transition_summary" msgid="8294295294239125591">"Pilih efek yang digunakan saat berpindah antar-slide"</string>
-    <string name="pref_gallery_slideshow_transition_dialogtitle" msgid="5483406447721500371">"Transisi rangkai slide"</string>
+    <string name="pref_gallery_slideshow_transition_dialogtitle" msgid="5483406447721500371">"Transisi slideshow"</string>
   <string-array name="pref_gallery_slideshow_transition_choices">
     <item msgid="2825716730899894863">"Angsur jelas &amp; angsur pudar"</item>
     <item msgid="403116336404005687">"Geser kiri - kanan"</item>
     <item msgid="4901733079450971731">"Geser atas - bawah"</item>
     <item msgid="9006732482485375438">"Pilihan acak"</item>
   </string-array>
-    <string name="pref_gallery_slideshow_repeat_title" msgid="6512135022461429738">"Ulangi rangkai slide"</string>
-    <string name="pref_gallery_slideshow_repeat_summary" msgid="8289230397431855268">"Putar rangkai slide lebih dari satu kali"</string>
+    <string name="pref_gallery_slideshow_repeat_title" msgid="6512135022461429738">"Ulangi slideshow"</string>
+    <string name="pref_gallery_slideshow_repeat_summary" msgid="8289230397431855268">"Putar slideshow lebih dari satu kali"</string>
     <string name="pref_gallery_slideshow_shuffle_title" msgid="3677508579783015598">"Acak slide"</string>
     <string name="pref_gallery_slideshow_shuffle_summary" msgid="8566948749149325715">"Tampilkan gambar dengan urutan acak"</string>
     <string name="camerasettings" msgid="2433519618178453928">"Setelan"</string>