From a9f4eb129100b63d7d842907604d8369f326bd24 Mon Sep 17 00:00:00 2001 From: MochaMind Date: Tue, 24 Feb 2026 22:48:29 +0530 Subject: [PATCH 1/3] chore: Spanish translations (cherry picked from commit 68848fc6425a1656a0355ec092d06f5216ce122d) # Conflicts: # lms/locale/es.po --- lms/locale/es.po | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lms/locale/es.po b/lms/locale/es.po index 87385ad6..34141e97 100644 --- a/lms/locale/es.po +++ b/lms/locale/es.po @@ -3,7 +3,11 @@ msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: jannat@frappe.io\n" "POT-Creation-Date: 2026-01-23 16:05+0000\n" +<<<<<<< HEAD "PO-Revision-Date: 2026-02-17 15:36\n" +======= +"PO-Revision-Date: 2026-02-24 17:18\n" +>>>>>>> 68848fc6 (chore: Spanish translations) "Last-Translator: jannat@frappe.io\n" "Language-Team: Spanish\n" "MIME-Version: 1.0\n" @@ -2300,7 +2304,7 @@ msgstr "" #. Label of the email_sent (Check) field in DocType 'LMS Course Interest' #: lms/lms/doctype/lms_course_interest/lms_course_interest.json msgid "Email Sent" -msgstr "" +msgstr "Correo Electrónico Enviado" #: frontend/src/pages/BatchForm.vue:161 msgid "Email Template" @@ -3436,7 +3440,7 @@ msgstr "Configuración de trabajo" #: lms/job/doctype/lms_job_application/lms_job_application.json #: lms/job/web_form/job_opportunity/job_opportunity.json msgid "Job Title" -msgstr "" +msgstr "Título del trabajo" #. Label of the jobs (Check) field in DocType 'LMS Settings' #: frontend/src/pages/JobApplications.vue:9 frontend/src/pages/JobDetail.vue:10 From 8f1604e237c6087c12396ec0eedda2c1389269fc Mon Sep 17 00:00:00 2001 From: MochaMind Date: Tue, 24 Feb 2026 22:48:48 +0530 Subject: [PATCH 2/3] chore: Persian translations (cherry picked from commit 63321fe2c83c57ff2bfc36d0bcbd968eeb3f4d98) --- lms/locale/fa.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lms/locale/fa.po b/lms/locale/fa.po index 232d4265..b64533b6 100644 --- a/lms/locale/fa.po +++ b/lms/locale/fa.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: jannat@frappe.io\n" "POT-Creation-Date: 2026-01-23 16:05+0000\n" -"PO-Revision-Date: 2026-02-15 14:24\n" +"PO-Revision-Date: 2026-02-24 17:18\n" "Last-Translator: jannat@frappe.io\n" "Language-Team: Persian\n" "MIME-Version: 1.0\n" @@ -7798,7 +7798,7 @@ msgstr "" #: frontend/src/pages/Programs/ProgramEnrollment.vue:80 msgid "rating" -msgstr "رتبه بندی" +msgstr "رتبه‌بندی" #: frontend/src/components/Settings/Categories.vue:19 msgid "saving..." From 5b22ef46c01cf8c984ed7f4ad27bd8c794cd5c5c Mon Sep 17 00:00:00 2001 From: Jannat Patel <31363128+pateljannat@users.noreply.github.com> Date: Wed, 25 Feb 2026 10:40:06 +0530 Subject: [PATCH 3/3] chore: resolved conflicts --- lms/locale/es.po | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lms/locale/es.po b/lms/locale/es.po index 34141e97..c625f06b 100644 --- a/lms/locale/es.po +++ b/lms/locale/es.po @@ -3,11 +3,7 @@ msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: jannat@frappe.io\n" "POT-Creation-Date: 2026-01-23 16:05+0000\n" -<<<<<<< HEAD -"PO-Revision-Date: 2026-02-17 15:36\n" -======= "PO-Revision-Date: 2026-02-24 17:18\n" ->>>>>>> 68848fc6 (chore: Spanish translations) "Last-Translator: jannat@frappe.io\n" "Language-Team: Spanish\n" "MIME-Version: 1.0\n"