From f77066d4bd5ee76cf5e0f84c3a7e74612a9c583e Mon Sep 17 00:00:00 2001
From: Mikael Finstad <finstaden@gmail.com>
Date: Sat, 4 Sep 2021 22:20:25 +0700
Subject: [PATCH] add cancel button to i18n

---
 src/dialogs.jsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/dialogs.jsx b/src/dialogs.jsx
index 5151c149..80f3e12e 100644
--- a/src/dialogs.jsx
+++ b/src/dialogs.jsx
@@ -360,6 +360,7 @@ export async function showMergeDialog(paths, onMergeClick) {
     width: '90%',
     showCancelButton: true,
     confirmButtonText: i18n.t('Merge!'),
+    cancelButtonText: i18n.t('Cancel'),
     willOpen: (el) => { swalElem = el; },
     title: i18n.t('Merge/concatenate files'),
     html: (<SortableFiles