Revert "chore: merge 'develop' into 'main'"

Merge pull request #1013 from frappe/develop
chore: merge 'develop' into 'main'
2024-09-11 11:10:34 +05:30 · 2024-09-11 11:09:55 +05:30 · 2024-09-10 21:02:55 +05:30 · 2024-09-06 16:03:59 +00:00 · 2024-09-06 10:49:52 +05:30 · 2024-09-06 10:40:25 +05:30
2 changed files with 12 additions and 12 deletions
--- a/lms/init.py
+++ b/lms/init.py
@@ -1 +1 @@
-__version__ = "2.3.0"
+__version__ = "2.4.0"
--- a/lms/locale/main.pot
+++ b/lms/locale/main.pot
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Frappe LMS VERSION\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2024-08-30 16:04+0000\n"
+"POT-Creation-Date: 2024-08-23 16:04+0000\n"
-"PO-Revision-Date: 2024-08-30 16:04+0000\n"
+"PO-Revision-Date: 2024-08-23 16:04+0000\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: jannat@frappe.io\n"
 "MIME-Version: 1.0\n"
@@ -138,7 +138,7 @@ msgstr ""
 msgid "Allow accessing future dates"
 msgstr ""
-#: overrides/user.py:199
+#: overrides/user.py:198
 msgid "Already Registered"
 msgstr ""
@@ -2489,7 +2489,7 @@ msgstr ""
 msgid "No."
 msgstr ""
-#: overrides/user.py:194
+#: overrides/user.py:193
 msgid "Not Allowed"
 msgstr ""
@@ -2754,11 +2754,11 @@ msgstr ""
 msgid "Please add <a href='{0}'>{1}</a> for <a href='{2}'>{3}</a> to send calendar invites for evaluations."
 msgstr ""
-#: overrides/user.py:240
+#: overrides/user.py:239
 msgid "Please ask your administrator to verify your sign-up"
 msgstr ""
-#: overrides/user.py:238
+#: overrides/user.py:237
 msgid "Please check your email for verification"
 msgstr ""
@@ -3059,7 +3059,7 @@ msgstr ""
 msgid "Registered"
 msgstr ""
-#: overrides/user.py:201
+#: overrides/user.py:200
 msgid "Registered but disabled"
 msgstr ""
@@ -3295,7 +3295,7 @@ msgstr ""
 msgid "Sidebar Items"
 msgstr ""
-#: overrides/user.py:194
+#: overrides/user.py:193
 msgid "Sign Up is disabled"
 msgstr ""
@@ -3339,7 +3339,7 @@ msgstr ""
 msgid "Skills"
 msgstr ""
-#: overrides/user.py:42
+#: overrides/user.py:41
 msgid "Skills must be unique"
 msgstr ""
@@ -3631,7 +3631,7 @@ msgstr ""
 msgid "Template"
 msgstr ""
-#: overrides/user.py:205
+#: overrides/user.py:204
 msgid "Temporarily Disabled"
 msgstr ""
@@ -3833,7 +3833,7 @@ msgstr ""
 msgid "To join this batch, please contact the Administrator."
 msgstr ""
-#: overrides/user.py:206
+#: overrides/user.py:205
 msgid "Too many users signed up recently, so the registration is disabled. Please try back in an hour"
 msgstr ""
Author	SHA1	Message	Date
Jannat Patel	7cdd155f75	Revert "chore: merge 'develop' into 'main'"	2024-09-11 11:10:34 +05:30
Jannat Patel	de8c907c51	Merge pull request #1013 from frappe/develop chore: merge 'develop' into 'main'	2024-09-11 11:09:55 +05:30
Jannat Patel	237ff8db07	Merge pull request #1008 from frappe/pot_develop_2024-09-06 chore: update POT file	2024-09-10 21:02:55 +05:30
frappe-pr-bot	b5e67a25d2	chore: update POT file	2024-09-06 16:03:59 +00:00
Jannat Patel	9d2ef4929c	Merge pull request #1007 from pateljannat/fix-notification fix: certificate request creation email	2024-09-06 10:49:52 +05:30
Jannat Patel	050084e552	style: fix formatting	2024-09-06 10:40:25 +05:30
Jannat Patel	86e9739218	fix: certificate request creation email	2024-09-06 10:19:25 +05:30
Jannat Patel	bd94890da7	Merge pull request #1005 from pateljannat/minor-ui-fix fix: member-list ui	2024-09-05 20:36:41 +05:30
Jannat Patel	965f6adb90	style: fixed formatting	2024-09-05 20:31:22 +05:30
Jannat Patel	4979569cf3	fix: member-list ui	2024-09-05 19:59:44 +05:30
Jannat Patel	0fd1cabd60	Merge pull request #1003 from frappe/develop chore: merge 'develop' into 'main'	2024-09-04 10:36:05 +05:30
Frappe PR Bot	5c21a0532a	chore(release): Bumped to Version 2.4.0	2024-09-04 05:00:25 +00:00
Jannat Patel	8dd480735c	Merge pull request #996 from frappe/develop chore: merge 'develop' into 'main'	2024-08-28 11:24:59 +05:30
Jannat Patel	676f1a1f0e	Merge pull request #984 from frappe/develop chore: merge 'develop' into 'main'	2024-08-21 10:48:23 +05:30
Jannat Patel	ce75422126	Merge pull request #966 from frappe/develop chore: merge 'develop' into 'main'	2024-08-14 11:24:10 +05:30
Jannat Patel	3a097d6b15	Merge pull request #956 from frappe/develop chore: Merge develop into main	2024-08-06 11:27:00 +05:30
Jannat Patel	9de1bf1020	Merge pull request #954 from frappe/develop chore: Merge develop into main	2024-08-05 14:47:45 +05:30
Jannat Patel	93e5cf1c25	Merge pull request #952 from frappe/develop chore: Merge develop to main	2024-08-05 12:22:05 +05:30
Jannat Patel	6e2376570b	Merge pull request #949 from frappe/develop chore: Merge develop to main	2024-08-01 17:16:22 +05:30
Jannat Patel	b20c4bf197	Merge pull request #948 from frappe/develop chore: Merge develop to main	2024-07-31 16:33:43 +05:30
Jannat Patel	6ae1d92033	Merge pull request #925 from frappe/develop chore: merge `develop` into `main`	2024-07-11 09:11:50 +05:30