From 5a7155ffc21a5bd54ced48468e8f024b25906f9f Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@erpnext.com>
Date: Wed, 5 Aug 2015 11:45:44 +0530
Subject: [PATCH 1/3] [minor] don't pop when message_log is empty

---
 frappe/desk/form/utils.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frappe/desk/form/utils.py b/frappe/desk/form/utils.py
index 75e0248fb8..83ede1c57c 100644
--- a/frappe/desk/form/utils.py
+++ b/frappe/desk/form/utils.py
@@ -144,7 +144,9 @@ def get_linked_docs(doctype, name, metadata_loaded=None, no_metadata=False):
 						filters=[[dt, link.get("fieldname"), '=', name]])
 
 			except frappe.PermissionError:
-				frappe.local.message_log.pop()
+				if frappe.local.message_log:
+					frappe.local.message_log.pop()
+
 				continue
 
 			if ret:

From e71d34cd5f51a1a07844d8f220a8a05f0ecb163a Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@erpnext.com>
Date: Fri, 7 Aug 2015 11:50:34 +0530
Subject: [PATCH 2/3] [patch] Rename chinese language

---
 frappe/patches.txt                             |  1 +
 frappe/patches/v5_3/__init__.py                |  0
 .../patches/v5_3/rename_chinese_languages.py   | 18 ++++++++++++++++++
 3 files changed, 19 insertions(+)
 create mode 100644 frappe/patches/v5_3/__init__.py
 create mode 100644 frappe/patches/v5_3/rename_chinese_languages.py

diff --git a/frappe/patches.txt b/frappe/patches.txt
index 785e7c5559..9b1acfe157 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -84,3 +84,4 @@ frappe.patches.v5_0.expire_old_scheduler_logs
 execute:frappe.permissions.reset_perms("DocType")
 execute:frappe.db.sql("delete from `tabProperty Setter` where `property` = 'idx'")
 frappe.patches.v5_2.change_checks_to_not_null
+frappe.patches.v5_3.rename_chinese_languages
diff --git a/frappe/patches/v5_3/__init__.py b/frappe/patches/v5_3/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/patches/v5_3/rename_chinese_languages.py b/frappe/patches/v5_3/rename_chinese_languages.py
new file mode 100644
index 0000000000..f70783d2cc
--- /dev/null
+++ b/frappe/patches/v5_3/rename_chinese_languages.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	language_map = {
+		"中国（简体）": "簡體中文",
+		"中國（繁體）": "正體中文"
+	}
+
+	language_in_system_settings = frappe.db.get_single_value("System Settings", "language")
+	if language_in_system_settings in language_map:
+		new_language_name = language_map[language_in_system_settings]
+		frappe.db.set_value("System Settings", "System Settings", "language", new_language_name)
+
+	for old_name, new_name in language_map.items():
+		frappe.db.sql("""update `tabUser` set language=%(new_name)s where language=%(old_name)s""",
+			{ "old_name": old_name, "new_name": new_name })

From 4ca5d8c4f4afbfbf4454aab5a102dd1c882aac3d Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@erpnext.com>
Date: Fri, 7 Aug 2015 12:23:12 +0600
Subject: [PATCH 3/3] bumped to version 5.3.1

---
 frappe/__version__.py | 2 +-
 frappe/hooks.py       | 2 +-
 setup.py              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/__version__.py b/frappe/__version__.py
index 1a8656e39f..9067ebe65d 100644
--- a/frappe/__version__.py
+++ b/frappe/__version__.py
@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = "5.3.0"
+__version__ = "5.3.1"
diff --git a/frappe/hooks.py b/frappe/hooks.py
index b5688b85a2..f42023cdc9 100644
--- a/frappe/hooks.py
+++ b/frappe/hooks.py
@@ -26,7 +26,7 @@ to ERPNext.
 """
 
 app_icon = "octicon octicon-circuit-board"
-app_version = "5.3.0"
+app_version = "5.3.1"
 app_color = "orange"
 github_link = "https://github.com/frappe/frappe"
 
diff --git a/setup.py b/setup.py
index 9cb8527760..0331cb863e 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = "5.3.0"
+version = "5.3.1"
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()