Merge branch 'main' of https://git.ifuntanhub.dev/Araya/student-web-if-development-kit

Fix conflict

assets/global/localization.js

@@ -579,16 +579,14 @@ const translations = {
         ape_hero_desc: 'Temukan berbagai peluang beasiswa untuk mendukung perjalanan akademik dan penelitian Anda. Program Studi Informatika UNTAN berkomitmen membantu mahasiswa meraih prestasi terbaik.',
         ape_hero_cta: 'Lihat Daftar Beasiswa',
         ape_stats_total: 'Total Mahasiswa Penerima<br>Beasiswa Semester Ini',
-        ape_stats_gov: 'Total Penerima Beasiswa<br>Pembiayaan Pemerintah',
-        ape_stats_private: 'Total Penerima Beasiswa<br>Pembiayaan Swasta',
+        ape_stats_s1: 'Total Penerima Beasiswa<br>Khusus S1',
+        ape_stats_studi: 'Total Penerima Beasiswa<br>Studi Lanjut',
         ape_dir_label: 'Daftar Beasiswa',
         ape_dir_title: 'Daftar Beasiswa',
         ape_dir_desc: 'Temukan beragam beasiswa dari berbagai sumber resmi yang tersedia untuk mahasiswa aktif, alumni, dan calon mahasiswa Program Studi Informatika UNTAN.',
         ape_dir_guide: 'Terima Bantuan Beasiswa?',
-        ape_filter_open: 'Sedang Buka',
-        ape_filter_closed: 'Ditutup',
-        ape_filter_gov: 'Pemerintah',
-        ape_filter_private: 'Swasta',
+        ape_filter_s1: 'Khusus S1',
+        ape_filter_studi: 'Studi Lanjut',
         ape_search_placeholder: 'Cari Nama Beasiswa...',
         ape_testimonial_title: 'Apa Kata Mereka?',
         ape_testimonial_desc: 'Cerita inspiratif dari para penerima beasiswa Program Studi Informatika UNTAN',
@@ -1354,16 +1352,14 @@ const translations = {
         ape_hero_desc: 'Discover various scholarship opportunities to support your academic and research journey. The Informatics Study Program at UNTAN is committed to helping students achieve excellence.',
         ape_hero_cta: 'View Scholarships',
         ape_stats_total: 'Total Scholarship<br>Recipients This Semester',
-        ape_stats_gov: 'Total Government<br>Scholarship Recipients',
-        ape_stats_private: 'Total Private<br>Scholarship Recipients',
+        ape_stats_s1: 'Total Undergraduate<br>Scholarship Recipients',
+        ape_stats_studi: 'Total Postgraduate<br>Scholarship Recipients',
         ape_dir_label: 'Scholarship Directory',
         ape_dir_title: 'Scholarship Directory',
         ape_dir_desc: 'Find various scholarships from official sources available for active students, alumni, and prospective students of the UNTAN Informatics Study Program.',
         ape_dir_guide: 'Need Scholarship Aid?',
-        ape_filter_open: 'Open',
-        ape_filter_closed: 'Closed',
-        ape_filter_gov: 'Government',
-        ape_filter_private: 'Private',
+        ape_filter_s1: 'Undergraduate',
+        ape_filter_studi: 'Postgraduate',
         ape_search_placeholder: 'Search Scholarship Name...',
         ape_testimonial_title: 'What They Say?',
         ape_testimonial_desc: 'Inspiring stories from scholarship recipients at UNTAN Informatics Study Program',