From f721a2929f88d3309ba730a552d40dc3f9eccf2a Mon Sep 17 00:00:00 2001
From: hrzzz <paulo_fabris@hotmail.com>
Date: Fri, 25 Feb 2022 16:56:23 -0300
Subject: [PATCH 1/2] fix(translation) - correction for translation

(cherry picked from commit 16de29a3cb13b771d41f3b26a2d80de8d2871b92)

# Conflicts:
#	erpnext/assets/doctype/asset/asset_dashboard.py
---
 erpnext/assets/doctype/asset/asset_dashboard.py             | 6 +++++-
 .../assets/doctype/asset_maintenance/asset_maintenance.js   | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/erpnext/assets/doctype/asset/asset_dashboard.py b/erpnext/assets/doctype/asset/asset_dashboard.py
index c9efe3d0848..461a67dbfc6 100644
--- a/erpnext/assets/doctype/asset/asset_dashboard.py
+++ b/erpnext/assets/doctype/asset/asset_dashboard.py
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 
+=======
+from frappe import _
+>>>>>>> 16de29a3cb (fix(translation) - correction for translation)
 
 def get_data():
 	return {
@@ -7,7 +11,7 @@ def get_data():
 		},
 		'transactions': [
 			{
-				'label': ['Movement'],
+				'label': _('Movement'),
 				'items': ['Asset Movement']
 			}
 		]
diff --git a/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js b/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js
index 52996e93475..5c03b98873b 100644
--- a/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js
+++ b/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js
@@ -48,7 +48,7 @@ frappe.ui.form.on('Asset Maintenance', {
 							<div class='col-sm-3 small'>
 								<a onclick="frappe.set_route('List', 'Asset Maintenance Log',
 									{'asset_name': '${d.asset_name}','maintenance_status': '${d.maintenance_status}' });">
-									${d.maintenance_status} <span class="badge">${d.count}</span>
+									${__(d.maintenance_status)} <span class="badge">${d.count}</span>
 								</a>
 							</div>
 						</div>`).appendTo(rows);

From 4b4b1048436c745892226f5c52471e858377346d Mon Sep 17 00:00:00 2001
From: Marica <maricadsouza221197@gmail.com>
Date: Wed, 9 Mar 2022 17:29:38 +0530
Subject: [PATCH 2/2] fix: Merge conflicts

---
 erpnext/assets/doctype/asset/asset_dashboard.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/erpnext/assets/doctype/asset/asset_dashboard.py b/erpnext/assets/doctype/asset/asset_dashboard.py
index 461a67dbfc6..c81b611a418 100644
--- a/erpnext/assets/doctype/asset/asset_dashboard.py
+++ b/erpnext/assets/doctype/asset/asset_dashboard.py
@@ -1,8 +1,5 @@
-<<<<<<< HEAD
-
-=======
 from frappe import _
->>>>>>> 16de29a3cb (fix(translation) - correction for translation)
+
 
 def get_data():
 	return {