Resolving conflict at localization.js

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

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,126 +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"]
-  },
-  {
-    "id": "bsw-011",
-    "nama": "Djarum Beasiswa Plus 2026/2027",
-    "nama_en": "Djarum Plus Scholarship 2026/2027",
-    "kategori": "Swasta",
-    "status": "Buka",
-    "deskripsi_singkat": "Program beasiswa prestasi dari Djarum Foundation untuk mahasiswa S1.",
-    "deskripsi_singkat_en": "Merit-based scholarship program from Djarum Foundation for undergraduate students.",
-    "syarat_umum": [
-      "Mahasiswa S1/D4 semester 4 dari semua disiplin ilmu.",
-      "IPK minimum 3.00 pada semester 3."
-    ],
-    "syarat_umum_en": [
-      "4th-semester undergraduate (S1/D4) students from all disciplines.",
-      "Minimum GPA of 3.00 in the 3rd semester."
-    ],
-    "kontak": "https://register.djarumbeasiswaplus.org/",
-    "tanggal_buka": "2026-04-08",
-    "tanggal_tutup": "2026-06-10",
-    "url_sumber": "https://register.djarumbeasiswaplus.org/",
-    "tags": ["S1", "D4", "Swasta", "Indonesia"]
-  },
-  {
-    "id": "bsw-012",
-    "nama": "Beasiswa Sobat Bumi Kalimantan 2026",
-    "nama_en": "Sobat Bumi Kalimantan Scholarship 2026",
-    "kategori": "Swasta",
-    "status": "Buka",
-    "deskripsi_singkat": "Beasiswa dari Pertamina Foundation khusus mahasiswa S1 di wilayah Kalimantan.",
-    "deskripsi_singkat_en": "Scholarship from Pertamina Foundation specifically for undergraduate students in the Kalimantan region.",
-    "syarat_umum": [
-      "Mahasiswa S1 aktif yang berdomisili atau kuliah di Kalimantan.",
-      "Memiliki kepedulian terhadap lingkungan hidup."
-    ],
-    "syarat_umum_en": [
-      "Active undergraduate students domiciled or studying in Kalimantan.",
-      "Demonstrate care and commitment to the environment."
-    ],
-    "kontak": "https://pertaminafoundation.org/",
-    "tanggal_buka": "2026-05-02",
-    "tanggal_tutup": "2026-07-01",
-    "url_sumber": "https://pertaminafoundation.org/",
-    "tags": ["S1", "Swasta", "Indonesia"]
-  },
-  {
-    "id": "bsw-013",
-    "nama": "Beasiswa Sehat Kemenkes 2026",
-    "nama_en": "Ministry of Health (Sehat) Scholarship 2026",
-    "kategori": "Pemerintah",
-    "status": "Segera Dibuka",
-    "deskripsi_singkat": "Program bantuan biaya pendidikan dari Kementerian Kesehatan untuk jenjang D3, D4, dan Profesi.",
-    "deskripsi_singkat_en": "Educational assistance program from the Ministry of Health for D3, D4, and Professional degrees.",
-    "syarat_umum": [
-      "Mahasiswa aktif jenjang D3, D4, atau Profesi di bidang kesehatan.",
-      "Memenuhi kualifikasi dan standar nilai dari Kementerian Kesehatan."
-    ],
-    "syarat_umum_en": [
-      "Active D3, D4, or Professional degree students in the health sector.",
-      "Meet the qualifications and academic standards of the Ministry of Health."
-    ],
-    "kontak": "https://sibk.kemkes.go.id/",
-    "tanggal_buka": "2026-06-08",
-    "tanggal_tutup": "2026-06-30",
-    "url_sumber": "https://sibk.kemkes.go.id/",
-    "tags": ["D3", "D4", "Profesi", "Pemerintah", "Indonesia"]
-  },
-  {
-    "id": "bsw-014",
-    "nama": "Beasiswa SDM Sawit 2026",
-    "nama_en": "Palm Oil Human Resources Scholarship 2026",
-    "kategori": "Pemerintah",
-    "status": "Buka",
-    "deskripsi_singkat": "Beasiswa pendanaan BPDPKS untuk pengembangan SDM Perkebunan Kelapa Sawit (D1-D4, S1).",
-    "deskripsi_singkat_en": "BPDPKS funding scholarship for the development of Palm Oil Plantation Human Resources (D1-D4, S1).",
-    "syarat_umum": [
-      "Terbuka untuk lulusan SMA/SMK/sederajat yang melanjutkan ke jenjang D1-D4 atau S1.",
-      "Bersedia ditempatkan atau mengabdi di sektor perkebunan kelapa sawit."
-    ],
-    "syarat_umum_en": [
-      "Open to high school/vocational school graduates continuing to D1-D4 or S1 levels.",
-      "Willing to be placed or serve in the palm oil plantation sector."
-    ],
-    "kontak": "https://sdmperkebunan.bpdp.or.id/",
-    "tanggal_buka": "2026-06-03",
-    "tanggal_tutup": "2026-06-20",
-    "url_sumber": "https://sdmperkebunan.bpdp.or.id/",
-    "tags": ["S1", "D1", "D3", "D4", "Pemerintah", "Indonesia"]
-  },
-  {
-    "id": "bsw-015",
-    "nama": "Beasiswa PPBP/PPTI BCA 2027",
-    "nama_en": "BCA PPBP/PPTI Scholarship 2027",
-    "kategori": "Swasta",
-    "status": "Buka",
-    "deskripsi_singkat": "Program Pendidikan Bisnis dan Perbankan (PPBP) serta Teknik Informatika (PPTI) dari BCA.",
-    "deskripsi_singkat_en": "Business and Banking Education Program (PPBP) and Informatics Engineering (PPTI) from BCA.",
-    "syarat_umum": [
-      "Lulusan SMA/SMK/sederajat yang berprestasi.",
-      "Lulus seleksi administrasi dan serangkaian tes dari BCA."
-    ],
-    "syarat_umum_en": [
-      "High-achieving high school/vocational school graduates.",
-      "Pass the administrative selection and a series of tests from BCA."
-    ],
-    "kontak": "https://bcafinance.co.id/Pendaftaran-Beasiswa-BCA-Finance-Peduli-2026-Dibuka",
-    "tanggal_buka": "2026-05-01",
-    "tanggal_tutup": "2026-10-20",
-    "url_sumber": "https://bcafinance.co.id/Pendaftaran-Beasiswa-BCA-Finance-Peduli-2026-Dibuka",
-    "tags": ["S1", "Swasta", "Indonesia"]
-  }
-  
-]
->>>>>>> b5bc7bad0c7de6e63a60018da0fe06e923bf094c

groups/ApeNameTeamE/index.html

@@ -1257,7 +1257,7 @@
                     <div class="stat-item" data-aos="fade-up" data-aos-delay="100">
                         <div class="stat-number" data-counter="12" id="ctr-s1">0</div>
                         <div class="stat-label" data-i18n-html="ape_stats_s1">
-                            Total Penerima Beasiswa<br>Khusus S1
+                            Total Penerima Beasiswa<br>On Going
                         </div>
                     </div>
 
@@ -1269,6 +1269,13 @@
                     </div>
 
                 </div>
+
+                <div class="text-center mt-6" data-aos="fade-up" data-aos-delay="300">
+                    <p style="font-size: 13px; font-style: italic; color: #08090a;">
+                        *Data per tanggal 11 Juni 2026
+                    </p>
+                </div>
+
             </div>
         </section>
 
@@ -1300,7 +1307,7 @@
                         <button class="filter-tab active" data-filter="semua" role="tab" aria-selected="true"
                             data-i18n="filter_all">Semua</button>
                         <button class="filter-tab" data-filter="s1" role="tab" aria-selected="false"
-                            data-i18n="ape_filter_s1">S1</button>
+                            data-i18n="ape_filter_s1">On Going</button>
                         <button class="filter-tab" data-filter="studi_lanjut" role="tab" aria-selected="false"
                             data-i18n="ape_filter_studi">Studi Lanjut</button>
                     </div>