diff --git a/assets/global/localization.js b/assets/global/localization.js
index ab488b7..2cbb0c2 100644
--- a/assets/global/localization.js
+++ b/assets/global/localization.js
@@ -579,13 +579,13 @@ 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 Beasiswa Semester Ini',
- ape_stats_s1: 'Total Penerima Beasiswa Khusus S1',
+ ape_stats_s1: 'Total Penerima Beasiswa On Going',
ape_stats_studi: 'Total Penerima Beasiswa 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_s1: 'Khusus S1',
+ ape_filter_s1: 'On Going',
ape_filter_studi: 'Studi Lanjut',
ape_search_placeholder: 'Cari Nama Beasiswa...',
ape_testimonial_title: 'Apa Kata Mereka?',
@@ -1352,13 +1352,13 @@ 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 Recipients This Semester',
- ape_stats_s1: 'Total Undergraduate Scholarship Recipients',
+ ape_stats_s1: 'Total Ongoing Scholarship Recipients',
ape_stats_studi: 'Total Postgraduate 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_s1: 'Undergraduate',
+ ape_filter_s1: 'Ongoing',
ape_filter_studi: 'Postgraduate',
ape_search_placeholder: 'Search Scholarship Name...',
ape_testimonial_title: 'What They Say?',
diff --git a/groups/ApeNameTeamE/data/beasiswa.json b/groups/ApeNameTeamE/data/beasiswa.json
index dbd6403..efaafa1 100644
--- a/groups/ApeNameTeamE/data/beasiswa.json
+++ b/groups/ApeNameTeamE/data/beasiswa.json
@@ -4,7 +4,6 @@
"nama": "Boustany Foundation Scholarship, MBA - Harvard University",
"nama_en": "Boustany Foundation Scholarship, MBA - Harvard University",
"status": "Buka",
-<<<<<<< HEAD
"tipe_pendanaan": "Swasta",
"jenjang": "S2",
"negara": "Amerika Serikat",
@@ -12,8 +11,6 @@
"tenggat_waktu": "2027-05-31",
"url": "https://www.schoters.com/id/beasiswa/boustany-foundation-scholarship-mba-harvard-university-1",
"thumbnail": "https://images.unsplash.com/photo-1541339907198-e08756dedf3f?w=400&q=80&auto=format&fit=crop",
-=======
->>>>>>> b5bc7bad0c7de6e63a60018da0fe06e923bf094c
"deskripsi_singkat": "Beasiswa bergengsi dari Boustany Foundation untuk program MBA di Harvard University, Amerika Serikat, bagi calon pemimpin bisnis dunia.",
"deskripsi_singkat_en": "A prestigious scholarship from the Boustany Foundation for the MBA program at Harvard University, United States, for future global business leaders.",
"syarat_umum": [
@@ -36,7 +33,6 @@
"nama": "La Trobe University - La Trobe High Achiever Scholarship (S1)",
"nama_en": "La Trobe University - La Trobe High Achiever Scholarship (S1)",
"status": "Buka",
-<<<<<<< HEAD
"tipe_pendanaan": "Swasta",
"jenjang": "S1",
"negara": "Australia",
@@ -44,8 +40,6 @@
"tenggat_waktu": "2026-12-31",
"url": "https://www.schoters.com/id/beasiswa/la-trobe-university-la-trobe-high-achiever-scholarship-2",
"thumbnail": "https://images.unsplash.com/photo-1523240795612-9a054b0db644?w=400&q=80&auto=format&fit=crop",
-=======
->>>>>>> b5bc7bad0c7de6e63a60018da0fe06e923bf094c
"deskripsi_singkat": "Beasiswa dari La Trobe University Australia untuk mahasiswa internasional jenjang S1 berprestasi tinggi yang ingin melanjutkan studi di Melbourne.",
"deskripsi_singkat_en": "Scholarship from La Trobe University Australia for high-achieving international undergraduate students who wish to pursue their studies in Melbourne.",
"syarat_umum": [
@@ -68,7 +62,6 @@
"nama": "Charles Sturt University - International Student Support Scholarship",
"nama_en": "Charles Sturt University - International Student Support Scholarship",
"status": "Buka",
-<<<<<<< HEAD
"tipe_pendanaan": "Swasta",
"jenjang": "S1",
"negara": "Australia",
@@ -76,8 +69,6 @@
"tenggat_waktu": "2026-12-31",
"url": "https://www.schoters.com/id/beasiswa/charles-sturt-university-international-student-support-scholarship-3",
"thumbnail": "https://images.unsplash.com/photo-1560472354-b33ff0c44a43?w=400&q=80&auto=format&fit=crop",
-=======
->>>>>>> b5bc7bad0c7de6e63a60018da0fe06e923bf094c
"deskripsi_singkat": "Beasiswa dukungan dari Charles Sturt University bagi mahasiswa internasional jenjang S1 yang mendaftar di kampus yang berlokasi di New South Wales, Australia.",
"deskripsi_singkat_en": "Support scholarship from Charles Sturt University for international undergraduate students enrolling at a campus located in New South Wales, Australia.",
"syarat_umum": [
@@ -100,7 +91,6 @@
"nama": "La Trobe University - La Trobe High Achiever Scholarship (S2)",
"nama_en": "La Trobe University - La Trobe High Achiever Scholarship (S2)",
"status": "Buka",
-<<<<<<< HEAD
"tipe_pendanaan": "Swasta",
"jenjang": "S2",
"negara": "Australia",
@@ -108,8 +98,6 @@
"tenggat_waktu": "2026-12-31",
"url": "https://www.schoters.com/id/beasiswa/la-trobe-university-la-trobe-high-achiever-scholarship-4",
"thumbnail": "https://images.unsplash.com/photo-1529156069898-49953e39b3ac?w=400&q=80&auto=format&fit=crop",
-=======
->>>>>>> b5bc7bad0c7de6e63a60018da0fe06e923bf094c
"deskripsi_singkat": "Beasiswa dari La Trobe University Australia untuk mahasiswa internasional jenjang S2 (Postgraduate) dengan pencapaian akademik tinggi.",
"deskripsi_singkat_en": "Scholarship from La Trobe University Australia for international postgraduate students with high academic achievements.",
"syarat_umum": [
@@ -132,7 +120,6 @@
"nama": "ETH Zurich - Excellence Scholarship & Opportunity Programme (ESOP)",
"nama_en": "ETH Zurich - Excellence Scholarship & Opportunity Programme (ESOP)",
"status": "Buka",
-<<<<<<< HEAD
"tipe_pendanaan": "Pemerintah",
"jenjang": "S2",
"negara": "Swiss",
@@ -140,8 +127,6 @@
"tenggat_waktu": "2026-11-30",
"url": "https://www.schoters.com/id/beasiswa/eth-zurich-excellence-scholarship-opportunity-programme-esop-5",
"thumbnail": "https://images.unsplash.com/photo-1497366754035-f200968a6e72?w=400&q=80&auto=format&fit=crop",
-=======
->>>>>>> b5bc7bad0c7de6e63a60018da0fe06e923bf094c
"deskripsi_singkat": "Beasiswa bergengsi dari ETH Zurich (salah satu universitas teknik terbaik dunia) untuk mahasiswa S2 internasional yang unggul secara akademik.",
"deskripsi_singkat_en": "Prestigious scholarship from ETH Zurich (one of the world's best engineering universities) for academically outstanding international master's students.",
"syarat_umum": [
@@ -166,7 +151,6 @@
"nama": "STUST - Scholarship for International Students (S3, Fully Funded)",
"nama_en": "STUST - Scholarship for International Students (S3, Fully Funded)",
"status": "Buka",
-<<<<<<< HEAD
"tipe_pendanaan": "Swasta",
"jenjang": "S3",
"negara": "Taiwan",
@@ -174,8 +158,6 @@
"tenggat_waktu": "2026-11-30",
"url": "https://www.schoters.com/id/beasiswa/southern-taiwan-university-of-science-and-technology-the-stust-scholarship-for-international-students-6",
"thumbnail": "https://images.unsplash.com/photo-1580582932707-520aed937b7b?w=400&q=80&auto=format&fit=crop",
-=======
->>>>>>> b5bc7bad0c7de6e63a60018da0fe06e923bf094c
"deskripsi_singkat": "Beasiswa penuh (fully funded) dari Southern Taiwan University of Science and Technology untuk mahasiswa internasional jenjang S3 (Doktoral).",
"deskripsi_singkat_en": "Fully funded scholarship from Southern Taiwan University of Science and Technology for international doctoral students.",
"syarat_umum": [
@@ -200,7 +182,6 @@
"nama": "STUST - Scholarship for International Students (S2, Partially Funded)",
"nama_en": "STUST - Scholarship for International Students (S2, Partially Funded)",
"status": "Buka",
-<<<<<<< HEAD
"tipe_pendanaan": "Swasta",
"jenjang": "S2",
"negara": "Taiwan",
@@ -208,8 +189,6 @@
"tenggat_waktu": "2026-11-30",
"url": "https://www.schoters.com/id/beasiswa/southern-taiwan-university-of-science-and-technology-the-stust-scholarship-for-international-students-7",
"thumbnail": "https://images.unsplash.com/photo-1606761568499-6d2451b23c66?w=400&q=80&auto=format&fit=crop",
-=======
->>>>>>> b5bc7bad0c7de6e63a60018da0fe06e923bf094c
"deskripsi_singkat": "Beasiswa parsial (partially funded) dari Southern Taiwan University of Science and Technology untuk mahasiswa internasional jenjang S2 (Magister).",
"deskripsi_singkat_en": "Partially funded scholarship from Southern Taiwan University of Science and Technology for international master's students.",
"syarat_umum": [
@@ -234,7 +213,6 @@
"nama": "University of Melbourne - Melbourne International Undergraduate Scholarship",
"nama_en": "University of Melbourne - Melbourne International Undergraduate Scholarship",
"status": "Buka",
-<<<<<<< HEAD
"tipe_pendanaan": "Swasta",
"jenjang": "S1",
"negara": "Australia",
@@ -242,8 +220,6 @@
"tenggat_waktu": "2026-10-31",
"url": "https://www.schoters.com/id/beasiswa/university-of-melbourne-melbourne-international-undergraduate-scholarship-8",
"thumbnail": "https://images.unsplash.com/photo-1504711434969-e33886168f5c?w=400&q=80&auto=format&fit=crop",
-=======
->>>>>>> b5bc7bad0c7de6e63a60018da0fe06e923bf094c
"deskripsi_singkat": "Beasiswa untuk mahasiswa internasional berprestasi yang mendaftar program S1 di University of Melbourne, salah satu universitas terbaik di Australia.",
"deskripsi_singkat_en": "Scholarship for outstanding international students applying for an undergraduate program at the University of Melbourne, one of Australia's best universities.",
"syarat_umum": [
@@ -268,7 +244,6 @@
"nama": "Charles Darwin University - CDU Global Merit Scholarship",
"nama_en": "Charles Darwin University - CDU Global Merit Scholarship",
"status": "Buka",
-<<<<<<< HEAD
"tipe_pendanaan": "Swasta",
"jenjang": "S1",
"negara": "Australia",
@@ -276,8 +251,6 @@
"tenggat_waktu": "2026-10-09",
"url": "https://www.schoters.com/id/beasiswa/charles-darwin-university-cdu-global-merit-scholarship-9",
"thumbnail": "https://images.unsplash.com/photo-1434030216411-0b793f4b4173?w=400&q=80&auto=format&fit=crop",
-=======
->>>>>>> b5bc7bad0c7de6e63a60018da0fe06e923bf094c
"deskripsi_singkat": "Beasiswa merit global dari Charles Darwin University (CDU) di Darwin, Australia, untuk mahasiswa internasional S1 yang memiliki rekam jejak akademik yang kuat.",
"deskripsi_singkat_en": "Global merit scholarship from Charles Darwin University (CDU) in Darwin, Australia, for international undergraduate students with a strong academic track record.",
"syarat_umum": [
@@ -302,16 +275,13 @@
"nama": "Deakin University - Vice-Chancellor's International Scholarship",
"nama_en": "Deakin University - Vice-Chancellor's International Scholarship",
"status": "Buka",
-<<<<<<< HEAD
"tipe_pendanaan": "Swasta",
"jenjang": "S1 & S2",
"negara": "Australia",
"tanggal_buka": "2026-05-21",
- "tenggat_waktu": "2026-09-25",
- "url": "https://www.schoters.com/id/beasiswa/deakin-university-vice-chancellor-s-international-scholarship-10",
+ "tanggal_tutup": "2026-09-25",
+ "url_sumber": "https://www.schoters.com/id/beasiswa/deakin-university-vice-chancellor-s-international-scholarship-10",
"thumbnail": "https://images.unsplash.com/photo-1541339907198-e08756dedf3f?w=400&q=80&auto=format&fit=crop",
-=======
->>>>>>> b5bc7bad0c7de6e63a60018da0fe06e923bf094c
"deskripsi_singkat": "Beasiswa bergengsi dari Wakil Rektor (Vice-Chancellor) Deakin University untuk mahasiswa internasional terbaik yang akan menempuh studi S1 atau S2 di Australia.",
"deskripsi_singkat_en": "Prestigious Vice-Chancellor's scholarship from Deakin University for the best international students pursuing an undergraduate or postgraduate degree in Australia.",
"syarat_umum": [
@@ -329,14 +299,6 @@
"Submit the scholarship application before the specified closing date"
],
"kontak": "Deakin University International — deakin.edu.au",
-<<<<<<< HEAD
- "tags": ["S1 & S2", "Swasta", "Australia", "Partially Funded", "Prestasi"]
- }
-]
-=======
- "tanggal_buka": "2026-05-21",
- "tanggal_tutup": "2026-09-25",
- "url_sumber": "https://www.schoters.com/id/beasiswa/deakin-university-vice-chancellor-s-international-scholarship-10",
"tags": ["S1 & S2", "S2", "Swasta", "Australia", "Partially Funded", "Prestasi"]
},
{
@@ -449,6 +411,4 @@
"url_sumber": "https://bcafinance.co.id/Pendaftaran-Beasiswa-BCA-Finance-Peduli-2026-Dibuka",
"tags": ["S1", "Swasta", "Indonesia"]
}
-
-]
->>>>>>> b5bc7bad0c7de6e63a60018da0fe06e923bf094c
+]
\ No newline at end of file
diff --git a/groups/ApeNameTeamE/index.html b/groups/ApeNameTeamE/index.html
index b29acfb..14d6bef 100644
--- a/groups/ApeNameTeamE/index.html
+++ b/groups/ApeNameTeamE/index.html
@@ -1257,7 +1257,7 @@
0
- Total Penerima Beasiswa Khusus S1
+ Total Penerima Beasiswa On Going